X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/188a6e175e63db63e13d77aebd0f996540ddf04e..1cf4bf5d983c65ac0bb3868f0bd962b016433265:/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 fc3cbda92..97f517133 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 @@ -84,18 +93,37 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest ## # test the index action with multiple pages def test_index_paged - create_list(:user_block, 50) + user_blocks = create_list(:user_block, 50).reverse + next_path = user_blocks_path - get user_blocks_path + get next_path assert_response :success - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", :count => 20 - end + check_user_blocks_table user_blocks[0...20] + check_no_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" - get user_blocks_path(:page => 2) + get next_path assert_response :success - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", :count => 20 + check_user_blocks_table user_blocks[20...40] + check_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" + + get next_path + assert_response :success + check_user_blocks_table user_blocks[40...50] + check_page_link "Newer Blocks" + check_no_page_link "Older Blocks" + end + + ## + # test the index action with invalid pages + def test_index_invalid_paged + %w[-1 0 fred].each do |id| + get user_blocks_path(:before => id) + assert_redirected_to :controller => :errors, :action => :bad_request + + get user_blocks_path(:after => id) + assert_redirected_to :controller => :errors, :action => :bad_request end end @@ -115,14 +143,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 @@ -156,6 +191,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check that the block creation page loads for moderators 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 +229,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 @@ -364,6 +401,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 @@ -416,6 +454,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 ## @@ -490,8 +529,9 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check the list of blocks for a user that is currently blocked 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 @@ -499,8 +539,9 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check the list of blocks for a user that has previously been blocked 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 @@ -509,18 +550,39 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # test the blocks_on action with multiple pages def test_blocks_on_paged user = create(:user) - create_list(:user_block, 50, :user => user) + user_blocks = create_list(:user_block, 50, :user => user).reverse + next_path = user_blocks_on_path(user) - get user_blocks_on_path(user) + get next_path assert_response :success - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", :count => 20 - end + check_user_blocks_table user_blocks[0...20] + check_no_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" - get user_blocks_on_path(user, :page => 2) + get next_path assert_response :success - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", :count => 20 + check_user_blocks_table user_blocks[20...40] + check_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" + + get next_path + assert_response :success + check_user_blocks_table user_blocks[40...50] + check_page_link "Newer Blocks" + check_no_page_link "Older Blocks" + end + + ## + # test the blocks_on action with invalid pages + def test_blocks_on_invalid_paged + user = create(:user) + + %w[-1 0 fred].each do |id| + get user_blocks_on_path(user, :before => id) + assert_redirected_to :controller => :errors, :action => :bad_request + + get user_blocks_on_path(user, :after => id) + assert_redirected_to :controller => :errors, :action => :bad_request end end @@ -543,16 +605,18 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # Check the list of blocks given by one moderator 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(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 @@ -568,18 +632,60 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # test the blocks_by action with multiple pages def test_blocks_by_paged user = create(:moderator_user) - create_list(:user_block, 50, :creator => user) + user_blocks = create_list(:user_block, 50, :creator => user).reverse + next_path = user_blocks_by_path(user) - get user_blocks_by_path(user) + get next_path assert_response :success - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", :count => 20 - end + check_user_blocks_table user_blocks[0...20] + check_no_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" - get user_blocks_by_path(user, :page => 2) + get next_path assert_response :success - assert_select "table#block_list tbody", :count => 1 do - assert_select "tr", :count => 20 + check_user_blocks_table user_blocks[20...40] + check_page_link "Newer Blocks" + next_path = check_page_link "Older Blocks" + + get next_path + assert_response :success + check_user_blocks_table user_blocks[40...50] + check_page_link "Newer Blocks" + check_no_page_link "Older Blocks" + end + + ## + # test the blocks_by action with invalid pages + def test_blocks_by_invalid_paged + user = create(:moderator_user) + + %w[-1 0 fred].each do |id| + get user_blocks_by_path(user, :before => id) + assert_redirected_to :controller => :errors, :action => :bad_request + + get user_blocks_by_path(user, :after => id) + assert_redirected_to :controller => :errors, :action => :bad_request + end + end + + private + + def check_user_blocks_table(user_blocks) + assert_dom "table#block_list tbody tr" do |rows| + assert_equal user_blocks.count, rows.count, "unexpected number of rows in user blocks table" + rows.zip(user_blocks).map do |row, user_block| + assert_dom row, "a[href='#{user_block_path user_block}']", 1 + end + end + end + + def check_no_page_link(name) + assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/, :count => 0 }, "unexpected #{name} page link" + end + + def check_page_link(name) + assert_select "a.page-link", { :text => /#{Regexp.quote(name)}/ }, "missing #{name} page link" do |buttons| + return buttons.first.attributes["href"].value end end end