X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0b901889da2e7f1e9babaf908c7ac4870e69842a..1e9d390c1e59c86f77b77fc33e1cc4e2eb8293d1:/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 b74e3de46..8891e5b36 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -67,14 +67,23 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest ## # test the index action def test_index + revoked_block = create(:user_block, :revoked) + + get user_blocks_path + assert_response :success + assert_select "table#block_list tbody tr", :count => 1 do + assert_select "a[href='#{user_path revoked_block.user}']", :text => revoked_block.user.display_name + assert_select "a[href='#{user_path revoked_block.creator}']", :text => revoked_block.creator.display_name + assert_select "a[href='#{user_path revoked_block.revoker}']", :text => revoked_block.revoker.display_name + end + active_block = create(:user_block) expired_block = create(:user_block, :expired) - revoked_block = create(:user_block, :revoked) get user_blocks_path assert_response :success - assert_select "table#block_list", :count => 1 do - assert_select "tr", 4 + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 3 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 @@ -115,14 +124,21 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Viewing an expired block should work get user_block_path(:id => expired_block) assert_response :success + assert_select "h1 a[href='#{user_path expired_block.user}']", :text => expired_block.user.display_name + assert_select "h1 a[href='#{user_path expired_block.creator}']", :text => expired_block.creator.display_name # Viewing a revoked block should work get user_block_path(:id => revoked_block) assert_response :success + assert_select "h1 a[href='#{user_path revoked_block.user}']", :text => revoked_block.user.display_name + assert_select "h1 a[href='#{user_path revoked_block.creator}']", :text => revoked_block.creator.display_name + assert_select "a[href='#{user_path revoked_block.revoker}']", :text => revoked_block.revoker.display_name # Viewing an active block should work, but shouldn't mark it as seen get user_block_path(:id => active_block) assert_response :success + assert_select "h1 a[href='#{user_path active_block.user}']", :text => active_block.user.display_name + assert_select "h1 a[href='#{user_path active_block.creator}']", :text => active_block.creator.display_name assert UserBlock.find(active_block.id).needs_view # Login as the blocked user @@ -140,22 +156,23 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest target_user = create(:user) # Check that the block creation page requires us to login - get new_user_block_path(:display_name => target_user.display_name) - assert_redirected_to login_path(:referer => new_user_block_path(:display_name => target_user.display_name)) + get new_user_block_path(target_user) + assert_redirected_to login_path(:referer => new_user_block_path(target_user)) # Login as a normal user session_for(create(:user)) # Check that normal users can't load the block creation page - get new_user_block_path(:display_name => target_user.display_name) + get new_user_block_path(target_user) assert_redirected_to :controller => "errors", :action => "forbidden" # Login as a moderator session_for(create(:moderator_user)) # Check that the block creation page loads for moderators - get new_user_block_path(:display_name => target_user.display_name) + get new_user_block_path(target_user) assert_response :success + assert_select "h1 a[href='#{user_path target_user}']", :text => target_user.display_name assert_select "form#new_user_block", :count => 1 do assert_select "textarea#user_block_reason", :count => 1 assert_select "select#user_block_period", :count => 1 @@ -193,6 +210,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that the block edit page loads for moderators get edit_user_block_path(:id => active_block) assert_response :success + assert_select "h1 a[href='#{user_path active_block.user}']", :text => active_block.user.display_name 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 @@ -232,7 +250,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest post user_blocks_path(:display_name => target_user.display_name, :user_block_period => "99") end - assert_redirected_to new_user_block_path(:display_name => target_user.display_name) + assert_redirected_to new_user_block_path(target_user) 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 @@ -364,6 +382,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest get revoke_user_block_path(:id => active_block) assert_response :success assert_template "revoke" + assert_select "h1 a[href='#{user_path active_block.user}']", :text => active_block.user.display_name assert_select "form", :count => 1 do assert_select "input#confirm[type='checkbox']", :count => 1 assert_select "input[type='submit'][value='Revoke!']", :count => 1 @@ -396,7 +415,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest create(:user_block, :user => blocked_user) # Asking for the revoke all blocks page with a bogus user name should fail - get user_blocks_on_path(:display_name => "non_existent_user") + get user_blocks_on_path("non_existent_user") assert_response :not_found # Check that the revoke all blocks page requires us to login @@ -416,6 +435,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that the revoke all blocks page loads for moderators get revoke_all_user_blocks_path(blocked_user) assert_response :success + assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name end ## @@ -476,31 +496,33 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest expired_block = create(:user_block, :expired, :user => unblocked_user) # Asking for a list of blocks with a bogus user name should fail - get user_blocks_on_path(:display_name => "non_existent_user") + get user_blocks_on_path("non_existent_user") assert_response :not_found assert_template "users/no_such_user" 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 user_blocks_on_path(:display_name => normal_user.display_name) + get user_blocks_on_path(normal_user) assert_response :success assert_select "table#block_list", false 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 user_blocks_on_path(:display_name => blocked_user.display_name) + get user_blocks_on_path(blocked_user) assert_response :success - assert_select "table#block_list", :count => 1 do - assert_select "tr", 3 + assert_select "h1 a[href='#{user_path blocked_user}']", :text => blocked_user.display_name + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 2 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 user_blocks_on_path(:display_name => unblocked_user.display_name) + get user_blocks_on_path(unblocked_user) assert_response :success - assert_select "table#block_list", :count => 1 do - assert_select "tr", 2 + assert_select "h1 a[href='#{user_path unblocked_user}']", :text => unblocked_user.display_name + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 1 assert_select "a[href='#{user_block_path(expired_block)}']", 1 end end @@ -511,13 +533,13 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest user = create(:user) create_list(:user_block, 50, :user => user) - get user_blocks_on_path(:display_name => user.display_name) + get user_blocks_on_path(user) assert_response :success assert_select "table#block_list tbody", :count => 1 do assert_select "tr", :count => 20 end - get user_blocks_on_path(:display_name => user.display_name, :page => 2) + get user_blocks_on_path(user, :page => 2) assert_response :success assert_select "table#block_list tbody", :count => 1 do assert_select "tr", :count => 20 @@ -535,30 +557,32 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest revoked_block = create(:user_block, :revoked, :creator => second_moderator_user) # Asking for a list of blocks with a bogus user name should fail - get user_blocks_by_path(:display_name => "non_existent_user") + get user_blocks_by_path("non_existent_user") assert_response :not_found assert_template "users/no_such_user" assert_select "h1", "The user non_existent_user does not exist" # Check the list of blocks given by one moderator - get user_blocks_by_path(:display_name => moderator_user.display_name) + get user_blocks_by_path(moderator_user) assert_response :success - assert_select "table#block_list", :count => 1 do - assert_select "tr", 2 + assert_select "h1 a[href='#{user_path moderator_user}']", :text => moderator_user.display_name + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 1 assert_select "a[href='#{user_block_path(active_block)}']", 1 end # Check the list of blocks given by a different moderator - get user_blocks_by_path(:display_name => second_moderator_user.display_name) + get user_blocks_by_path(second_moderator_user) assert_response :success - assert_select "table#block_list", :count => 1 do - assert_select "tr", 3 + assert_select "h1 a[href='#{user_path second_moderator_user}']", :text => second_moderator_user.display_name + assert_select "table#block_list tbody", :count => 1 do + assert_select "tr", 2 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 user_blocks_by_path(:display_name => normal_user.display_name) + get user_blocks_by_path(normal_user) assert_response :success assert_select "table#block_list", false assert_select "p", "#{normal_user.display_name} has not made any blocks yet." @@ -570,13 +594,13 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest user = create(:moderator_user) create_list(:user_block, 50, :creator => user) - get user_blocks_by_path(:display_name => user.display_name) + get user_blocks_by_path(user) assert_response :success assert_select "table#block_list tbody", :count => 1 do assert_select "tr", :count => 20 end - get user_blocks_by_path(:display_name => user.display_name, :page => 2) + get user_blocks_by_path(user, :page => 2) assert_response :success assert_select "table#block_list tbody", :count => 1 do assert_select "tr", :count => 20