X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7..124ec2e9d560e0df291e5a8e5aa67ef5db2f5d46:/test/controllers/user_blocks_controller_test.rb diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 839dadf19..c821ea39e 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -1,8 +1,6 @@ require "test_helper" class UserBlocksControllerTest < ActionController::TestCase - fixtures :users, :user_roles, :user_blocks - ## # test all routes which lead to this controller def test_routes @@ -61,20 +59,27 @@ class UserBlocksControllerTest < ActionController::TestCase ## # test the index action def test_index - # The list of blocks should load + active_block = create(:user_block) + expired_block = create(:user_block, :expired) + revoked_block = create(:user_block, :revoked) + get :index assert_response :success assert_select "table#block_list", :count => 1 do assert_select "tr", 4 - assert_select "a[href='#{user_block_path(user_blocks(:active_block))}']", 1 - assert_select "a[href='#{user_block_path(user_blocks(:expired_block))}']", 1 - assert_select "a[href='#{user_block_path(user_blocks(:revoked_block))}']", 1 + assert_select "a[href='#{user_block_path(active_block)}']", 1 + assert_select "a[href='#{user_block_path(expired_block)}']", 1 + assert_select "a[href='#{user_block_path(revoked_block)}']", 1 end end ## # test the show action def test_show + active_block = create(:user_block, :needs_view) + expired_block = create(:user_block, :expired) + revoked_block = create(:user_block, :revoked) + # Viewing a block should fail when no ID is given assert_raise ActionController::UrlGenerationError do get :show @@ -87,47 +92,49 @@ class UserBlocksControllerTest < ActionController::TestCase assert_select "p", "Sorry, the user block with ID 99999 could not be found." # Viewing an expired block should work - get :show, :id => user_blocks(:expired_block) + get :show, :id => expired_block.id assert_response :success # Viewing a revoked block should work - get :show, :id => user_blocks(:revoked_block) + get :show, :id => revoked_block.id assert_response :success # Viewing an active block should work, but shouldn't mark it as seen - get :show, :id => user_blocks(:active_block) + get :show, :id => active_block.id assert_response :success - assert_equal true, UserBlock.find(user_blocks(:active_block).id).needs_view + assert_equal true, UserBlock.find(active_block.id).needs_view # Login as the blocked user - session[:user] = users(:blocked_user).id + session[:user] = active_block.user.id # Now viewing it should mark it as seen - get :show, :id => user_blocks(:active_block) + get :show, :id => active_block.id assert_response :success - assert_equal false, UserBlock.find(user_blocks(:active_block).id).needs_view + assert_equal false, UserBlock.find(active_block.id).needs_view end ## # test the new action def test_new + target_user = create(:user) + # Check that the block creation page requires us to login - get :new, :display_name => users(:normal_user).display_name - assert_redirected_to login_path(:referer => new_user_block_path(:display_name => users(:normal_user).display_name)) + get :new, :display_name => target_user.display_name + assert_redirected_to login_path(:referer => new_user_block_path(:display_name => target_user.display_name)) # Login as a normal user - session[:user] = users(:public_user).id + session[:user] = create(:user).id # Check that normal users can't load the block creation page - get :new, :display_name => users(:normal_user).display_name + get :new, :display_name => target_user.display_name assert_redirected_to user_blocks_path assert_equal "You need to be a moderator to perform that action.", flash[:error] # Login as a moderator - session[:user] = users(:moderator_user).id + session[:user] = create(:moderator_user).id # Check that the block creation page loads for moderators - get :new, :display_name => users(:normal_user).display_name + get :new, :display_name => target_user.display_name assert_response :success assert_select "form#new_user_block", :count => 1 do assert_select "textarea#user_block_reason", :count => 1 @@ -153,25 +160,27 @@ class UserBlocksControllerTest < ActionController::TestCase ## # test the edit action def test_edit + active_block = create(:user_block) + # Check that the block edit page requires us to login - get :edit, :id => user_blocks(:active_block).id - assert_redirected_to login_path(:referer => edit_user_block_path(:id => user_blocks(:active_block).id)) + get :edit, :id => active_block.id + assert_redirected_to login_path(:referer => edit_user_block_path(:id => active_block.id)) # Login as a normal user - session[:user] = users(:public_user).id + session[:user] = create(:user).id # Check that normal users can't load the block edit page - get :edit, :id => user_blocks(:active_block).id + get :edit, :id => active_block.id assert_redirected_to user_blocks_path assert_equal "You need to be a moderator to perform that action.", flash[:error] # Login as a moderator - session[:user] = users(:moderator_user).id + session[:user] = create(:moderator_user).id # Check that the block edit page loads for moderators - get :edit, :id => user_blocks(:active_block).id + get :edit, :id => active_block.id assert_response :success - assert_select "form#edit_user_block_#{user_blocks(:active_block).id}", :count => 1 do + assert_select "form#edit_user_block_#{active_block.id}", :count => 1 do assert_select "textarea#user_block_reason", :count => 1 assert_select "select#user_block_period", :count => 1 assert_select "input#user_block_needs_view[type='checkbox']", :count => 1 @@ -193,39 +202,42 @@ class UserBlocksControllerTest < ActionController::TestCase ## # test the create action def test_create + target_user = create(:user) + moderator_user = create(:moderator_user) + # Not logged in yet, so creating a block should fail post :create assert_response :forbidden # Login as a normal user - session[:user] = users(:public_user).id + session[:user] = create(:user).id # Check that normal users can't create blocks post :create assert_response :forbidden # Login as a moderator - session[:user] = users(:moderator_user).id + session[:user] = moderator_user.id # A bogus block period should result in an error assert_no_difference "UserBlock.count" do post :create, - :display_name => users(:unblocked_user).display_name, + :display_name => target_user.display_name, :user_block_period => "99" end - assert_redirected_to new_user_block_path(:display_name => users(:unblocked_user).display_name) + assert_redirected_to new_user_block_path(:display_name => target_user.display_name) assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error] # Check that creating a block works assert_difference "UserBlock.count", 1 do post :create, - :display_name => users(:unblocked_user).display_name, + :display_name => target_user.display_name, :user_block_period => "12", :user_block => { :needs_view => false, :reason => "Vandalism" } end id = UserBlock.order(:id).ids.last assert_redirected_to user_block_path(:id => id) - assert_equal "Created a block on user #{users(:unblocked_user).display_name}.", flash[:notice] + assert_equal "Created a block on user #{target_user.display_name}.", flash[:notice] b = UserBlock.find(id) assert_in_delta Time.now, b.created_at, 1 assert_in_delta Time.now, b.updated_at, 1 @@ -233,7 +245,7 @@ class UserBlocksControllerTest < ActionController::TestCase assert_equal false, b.needs_view assert_equal "Vandalism", b.reason assert_equal "markdown", b.reason_format - assert_equal users(:moderator_user).id, b.creator_id + assert_equal moderator_user.id, b.creator_id # We should get an error if no user is specified post :create @@ -251,52 +263,56 @@ class UserBlocksControllerTest < ActionController::TestCase ## # test the update action def test_update + moderator_user = create(:moderator_user) + second_moderator_user = create(:moderator_user) + active_block = create(:user_block, :creator => moderator_user) + # Not logged in yet, so updating a block should fail - put :update, :id => user_blocks(:active_block).id + put :update, :id => active_block.id assert_response :forbidden # Login as a normal user - session[:user] = users(:public_user).id + session[:user] = create(:user).id # Check that normal users can't update blocks - put :update, :id => user_blocks(:active_block).id + put :update, :id => active_block.id assert_response :forbidden # Login as the wrong moderator - session[:user] = users(:second_moderator_user).id + session[:user] = second_moderator_user.id # Check that only the person who created a block can update it assert_no_difference "UserBlock.count" do put :update, - :id => user_blocks(:active_block).id, + :id => active_block.id, :user_block_period => "12", :user_block => { :needs_view => true, :reason => "Vandalism" } end - assert_redirected_to edit_user_block_path(:id => user_blocks(:active_block).id) + assert_redirected_to edit_user_block_path(:id => active_block.id) assert_equal "Only the moderator who created this block can edit it.", flash[:error] # Login as the correct moderator - session[:user] = users(:moderator_user).id + session[:user] = moderator_user.id # A bogus block period should result in an error assert_no_difference "UserBlock.count" do put :update, - :id => user_blocks(:active_block).id, + :id => active_block.id, :user_block_period => "99" end - assert_redirected_to edit_user_block_path(:id => user_blocks(:active_block).id) + assert_redirected_to edit_user_block_path(:id => active_block.id) assert_equal "The blocking period must be one of the values selectable in the drop-down list.", flash[:error] # Check that updating a block works assert_no_difference "UserBlock.count" do put :update, - :id => user_blocks(:active_block).id, + :id => active_block.id, :user_block_period => "12", :user_block => { :needs_view => true, :reason => "Vandalism" } end - assert_redirected_to user_block_path(:id => user_blocks(:active_block).id) + assert_redirected_to user_block_path(:id => active_block.id) assert_equal "Block updated.", flash[:notice] - b = UserBlock.find(user_blocks(:active_block).id) + b = UserBlock.find(active_block.id) assert_in_delta Time.now, b.updated_at, 1 assert_equal true, b.needs_view assert_equal "Vandalism", b.reason @@ -316,23 +332,25 @@ class UserBlocksControllerTest < ActionController::TestCase ## # test the revoke action def test_revoke + active_block = create(:user_block) + # Check that the block revoke page requires us to login - get :revoke, :id => user_blocks(:active_block).id - assert_redirected_to login_path(:referer => revoke_user_block_path(:id => user_blocks(:active_block).id)) + get :revoke, :id => active_block.id + assert_redirected_to login_path(:referer => revoke_user_block_path(:id => active_block.id)) # Login as a normal user - session[:user] = users(:public_user).id + session[:user] = create(:user).id # Check that normal users can't load the block revoke page - get :revoke, :id => user_blocks(:active_block).id + get :revoke, :id => active_block.id assert_redirected_to user_blocks_path assert_equal "You need to be a moderator to perform that action.", flash[:error] # Login as a moderator - session[:user] = users(:moderator_user).id + session[:user] = create(:moderator_user).id # Check that the block revoke page loads for moderators - get :revoke, :id => user_blocks(:active_block).id + get :revoke, :id => active_block.id assert_response :success assert_template "revoke" assert_select "form", :count => 1 do @@ -341,9 +359,9 @@ class UserBlocksControllerTest < ActionController::TestCase end # Check that revoking a block works - post :revoke, :id => user_blocks(:active_block).id, :confirm => true - assert_redirected_to user_block_path(:id => user_blocks(:active_block).id) - b = UserBlock.find(user_blocks(:active_block).id) + post :revoke, :id => active_block.id, :confirm => true + assert_redirected_to user_block_path(:id => active_block.id) + b = UserBlock.find(active_block.id) assert_in_delta Time.now, b.ends_at, 1 # We should get an error if no block ID is specified @@ -361,6 +379,13 @@ class UserBlocksControllerTest < ActionController::TestCase ## # test the blocks_on action def test_blocks_on + blocked_user = create(:user) + unblocked_user = create(:user) + normal_user = create(:user) + active_block = create(:user_block, :user => blocked_user) + revoked_block = create(:user_block, :revoked, :user => blocked_user) + expired_block = create(:user_block, :expired, :user => unblocked_user) + # Asking for a list of blocks with no user name should fail assert_raise ActionController::UrlGenerationError do get :blocks_on @@ -373,32 +398,39 @@ class UserBlocksControllerTest < ActionController::TestCase assert_select "h1", "The user non_existent_user does not exist" # Check the list of blocks for a user that has never been blocked - get :blocks_on, :display_name => users(:normal_user).display_name + get :blocks_on, :display_name => normal_user.display_name assert_response :success assert_select "table#block_list", false - assert_select "p", "#{users(:normal_user).display_name} has not been blocked yet." + assert_select "p", "#{normal_user.display_name} has not been blocked yet." # Check the list of blocks for a user that is currently blocked - get :blocks_on, :display_name => users(:blocked_user).display_name + get :blocks_on, :display_name => blocked_user.display_name assert_response :success assert_select "table#block_list", :count => 1 do assert_select "tr", 3 - assert_select "a[href='#{user_block_path(user_blocks(:active_block))}']", 1 - assert_select "a[href='#{user_block_path(user_blocks(:revoked_block))}']", 1 + assert_select "a[href='#{user_block_path(active_block)}']", 1 + assert_select "a[href='#{user_block_path(revoked_block)}']", 1 end # Check the list of blocks for a user that has previously been blocked - get :blocks_on, :display_name => users(:unblocked_user).display_name + get :blocks_on, :display_name => unblocked_user.display_name assert_response :success assert_select "table#block_list", :count => 1 do assert_select "tr", 2 - assert_select "a[href='#{user_block_path(user_blocks(:expired_block))}']", 1 + assert_select "a[href='#{user_block_path(expired_block)}']", 1 end end ## # test the blocks_by action def test_blocks_by + moderator_user = create(:moderator_user) + second_moderator_user = create(:moderator_user) + normal_user = create(:user) + active_block = create(:user_block, :creator => moderator_user) + expired_block = create(:user_block, :expired, :creator => second_moderator_user) + revoked_block = create(:user_block, :revoked, :creator => second_moderator_user) + # Asking for a list of blocks with no user name should fail assert_raise ActionController::UrlGenerationError do get :blocks_by @@ -411,26 +443,26 @@ class UserBlocksControllerTest < ActionController::TestCase assert_select "h1", "The user non_existent_user does not exist" # Check the list of blocks given by one moderator - get :blocks_by, :display_name => users(:moderator_user).display_name + get :blocks_by, :display_name => moderator_user.display_name assert_response :success assert_select "table#block_list", :count => 1 do assert_select "tr", 2 - assert_select "a[href='#{user_block_path(user_blocks(:active_block))}']", 1 + assert_select "a[href='#{user_block_path(active_block)}']", 1 end # Check the list of blocks given by a different moderator - get :blocks_by, :display_name => users(:second_moderator_user).display_name + get :blocks_by, :display_name => second_moderator_user.display_name assert_response :success assert_select "table#block_list", :count => 1 do assert_select "tr", 3 - assert_select "a[href='#{user_block_path(user_blocks(:expired_block))}']", 1 - assert_select "a[href='#{user_block_path(user_blocks(:revoked_block))}']", 1 + assert_select "a[href='#{user_block_path(expired_block)}']", 1 + assert_select "a[href='#{user_block_path(revoked_block)}']", 1 end # Check the list of blocks (not) given by a normal user - get :blocks_by, :display_name => users(:normal_user).display_name + get :blocks_by, :display_name => normal_user.display_name assert_response :success assert_select "table#block_list", false - assert_select "p", "#{users(:normal_user).display_name} has not made any blocks yet." + assert_select "p", "#{normal_user.display_name} has not made any blocks yet." end end