X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ec5754a9bd56dbb802a2897851ebf71deb017f89..6cc31259e4e96784e4937c8c0ae561f8291ecaa2:/test/controllers/user_blocks_controller_test.rb?ds=sidebyside diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index ed310f52e..ddb33e903 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -1,11 +1,14 @@ require "test_helper" +require_relative "user_blocks/table_test_helper" class UserBlocksControllerTest < ActionDispatch::IntegrationTest + include UserBlocks::TableTestHelper + ## # test all routes which lead to this controller def test_routes assert_routing( - { :path => "/blocks/new/username", :method => :get }, + { :path => "/user_blocks/new/username", :method => :get }, { :controller => "user_blocks", :action => "new", :display_name => "username" } ) @@ -33,23 +36,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest { :path => "/user_blocks/1", :method => :delete }, { :controller => "user_blocks", :action => "destroy", :id => "1" } ) - - assert_routing( - { :path => "/user/username/blocks", :method => :get }, - { :controller => "user_blocks", :action => "blocks_on", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/blocks_by", :method => :get }, - { :controller => "user_blocks", :action => "blocks_by", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/blocks/revoke_all", :method => :get }, - { :controller => "user_blocks", :action => "revoke_all", :display_name => "username" } - ) - assert_routing( - { :path => "/user/username/blocks/revoke_all", :method => :post }, - { :controller => "user_blocks", :action => "revoke_all", :display_name => "username" } - ) end ## @@ -123,38 +109,96 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest revoked_block = create(:user_block, :revoked) # Viewing a block should fail when a bogus ID is given - get user_block_path(:id => 99999) + get user_block_path(99999) assert_response :not_found assert_template "not_found" assert_select "p", "Sorry, the user block with ID 99999 could not be found." # Viewing an expired block should work - get user_block_path(:id => expired_block) + get user_block_path(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) + get user_block_path(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) + get user_block_path(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 + end - # Login as the blocked user - session_for(active_block.user) + ## + # test clearing needs_view by showing a zero-hour block to the blocked user + def test_show_sets_deactivates_at_for_zero_hour_block + user = create(:user) + session_for(user) - # Now viewing it should mark it as seen - get user_block_path(:id => active_block) - assert_response :success - assert_not UserBlock.find(active_block.id).needs_view + freeze_time do + block = create(:user_block, :needs_view, :zero_hour, :user => user) + assert block.needs_view + assert_nil block.deactivates_at + + travel 1.hour + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc, block.deactivates_at + + travel 1.hour + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc - 1.hour, block.deactivates_at + end + end + + ## + # test clearing needs_view by showing a timed block to the blocked user + def test_show_sets_deactivates_at_for_timed_block + user = create(:user) + session_for(user) + + freeze_time do + block = create(:user_block, :needs_view, :created_at => Time.now.utc, :ends_at => Time.now.utc + 24.hours, :user => user) + assert block.needs_view + assert_nil block.deactivates_at + + travel 1.hour + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc + 23.hours, block.deactivates_at + + travel 1.hour + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc + 22.hours, block.deactivates_at + + travel 24.hours + + get user_block_path(block) + assert_response :success + block.reload + assert_not block.needs_view + assert_equal Time.now.utc - 2.hours, block.deactivates_at + end end ## @@ -235,7 +279,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest end # We should get an error if the user doesn't exist - get new_user_block_path(:display_name => "non_existent_user") + get new_user_block_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" @@ -249,21 +293,21 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest active_block = create(:user_block, :creator => creator_user) # Check that the block edit page requires us to login - get edit_user_block_path(:id => active_block) + get edit_user_block_path(active_block) assert_redirected_to login_path(:referer => edit_user_block_path(active_block)) # Login as a normal user session_for(create(:user)) # Check that normal users can't load the block edit page - get edit_user_block_path(:id => active_block) + get edit_user_block_path(active_block) assert_redirected_to :controller => "errors", :action => "forbidden" # Login as a moderator session_for(other_moderator_user) # Check that the block edit page loads for moderators - get edit_user_block_path(:id => active_block) + get edit_user_block_path(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 @@ -280,7 +324,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest session_for(creator_user) # Check that the block edit page loads for the creator - get edit_user_block_path(:id => active_block) + get edit_user_block_path(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 @@ -294,7 +338,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest end # We should get an error if the user doesn't exist - get edit_user_block_path(:id => 99999) + get edit_user_block_path(99999) assert_response :not_found assert_template "not_found" assert_select "p", "Sorry, the user block with ID 99999 could not be found." @@ -363,7 +407,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest :user_block => { :needs_view => false, :reason => "Vandalism" }) end b = UserBlock.last - assert_redirected_to user_block_path(:id => b.id) + assert_redirected_to user_block_path(b) assert_equal "Created a block on user #{target_user.display_name}.", flash[:notice] assert_in_delta Time.now.utc, b.created_at, 1 assert_in_delta Time.now.utc, b.updated_at, 1 @@ -408,14 +452,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest active_block = create(:user_block, :creator => moderator_user) # Not logged in yet, so updating a block should fail - put user_block_path(:id => active_block) + put user_block_path(active_block) assert_response :forbidden # Login as a normal user session_for(create(:user)) # Check that normal users can't update blocks - put user_block_path(:id => active_block) + put user_block_path(active_block) assert_redirected_to :controller => "errors", :action => "forbidden" # Login as the moderator @@ -423,14 +467,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest # A bogus block period should result in an error assert_no_difference "UserBlock.count" do - put user_block_path(:id => active_block, :user_block_period => "99") + put user_block_path(active_block, :user_block_period => "99") end assert_redirected_to edit_user_block_path(active_block) 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 user_block_path(:id => active_block, + put user_block_path(active_block, :user_block_period => "12", :user_block => { :needs_view => true, :reason => "Vandalism" }) end @@ -442,7 +486,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_equal "Vandalism", b.reason # We should get an error if the block doesn't exist - put user_block_path(:id => 99999) + put user_block_path(99999) assert_response :not_found assert_template "not_found" assert_select "p", "Sorry, the user block with ID 99999 could not be found." @@ -545,83 +589,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_equal other_moderator_user, block.revoker end - ## - # test the revoke all page - def test_revoke_all_page - blocked_user = create(:user) - 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("non_existent_user") - assert_response :not_found - - # Check that the revoke all blocks page requires us to login - get revoke_all_user_blocks_path(blocked_user) - assert_redirected_to login_path(:referer => revoke_all_user_blocks_path(blocked_user)) - - # Login as a normal user - session_for(create(:user)) - - # Check that normal users can't load the revoke all blocks page - get revoke_all_user_blocks_path(blocked_user) - assert_redirected_to :controller => "errors", :action => "forbidden" - - # Login as a moderator - session_for(create(:moderator_user)) - - # 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 - - ## - # test the revoke all action - def test_revoke_all_action - blocked_user = create(:user) - active_block1 = create(:user_block, :user => blocked_user) - active_block2 = create(:user_block, :user => blocked_user) - expired_block1 = create(:user_block, :expired, :user => blocked_user) - blocks = [active_block1, active_block2, expired_block1] - moderator_user = create(:moderator_user) - - assert_predicate active_block1, :active? - assert_predicate active_block2, :active? - assert_not_predicate expired_block1, :active? - - # Login as a normal user - session_for(create(:user)) - - # Check that normal users can't load the block revoke page - get revoke_all_user_blocks_path(:blocked_user) - assert_redirected_to :controller => "errors", :action => "forbidden" - - # Login as a moderator - session_for(moderator_user) - - # Check that revoking blocks using GET should fail - get revoke_all_user_blocks_path(blocked_user, :confirm => true) - assert_response :success - assert_template "revoke_all" - - blocks.each(&:reload) - assert_predicate active_block1, :active? - assert_predicate active_block2, :active? - assert_not_predicate expired_block1, :active? - - # Check that revoking blocks works using POST - post revoke_all_user_blocks_path(blocked_user, :confirm => true) - assert_redirected_to user_blocks_on_path(blocked_user) - - blocks.each(&:reload) - assert_not_predicate active_block1, :active? - assert_not_predicate active_block2, :active? - assert_not_predicate expired_block1, :active? - assert_equal moderator_user, active_block1.revoker - assert_equal moderator_user, active_block2.revoker - assert_not_equal moderator_user, expired_block1.revoker - end - ## # test changes to end/deactivation dates def test_dates_when_viewed_before_end @@ -636,15 +603,15 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest :user_block => { :needs_view => true, :reason => "Testing deactivates_at" }) end block = UserBlock.last - assert_equal Time.now.utc + 2.days, block.ends_at + assert_equal Time.now.utc + 48.hours, block.ends_at assert_nil block.deactivates_at - travel 1.day + travel 24.hours session_for(blocked_user) get user_block_path(block) block.reload - assert_equal Time.now.utc + 1.day, block.ends_at - assert_equal Time.now.utc + 1.day, block.deactivates_at + assert_equal Time.now.utc + 24.hours, block.ends_at + assert_equal Time.now.utc + 24.hours, block.deactivates_at end end @@ -660,14 +627,14 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest :user_block => { :needs_view => true, :reason => "Testing deactivates_at" }) end block = UserBlock.last - assert_equal Time.now.utc + 1.day, block.ends_at + assert_equal Time.now.utc + 24.hours, block.ends_at assert_nil block.deactivates_at - travel 2.days + travel 48.hours session_for(blocked_user) get user_block_path(block) block.reload - assert_equal Time.now.utc - 1.day, block.ends_at + assert_equal Time.now.utc - 24.hours, block.ends_at assert_equal Time.now.utc, block.deactivates_at end end @@ -684,16 +651,16 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest :user_block => { :needs_view => false, :reason => "Testing deactivates_at" }) end block = UserBlock.last - assert_equal Time.now.utc + 2.days, block.ends_at - assert_equal Time.now.utc + 2.days, block.deactivates_at + assert_equal Time.now.utc + 48.hours, block.ends_at + assert_equal Time.now.utc + 48.hours, block.deactivates_at - travel 1.day + travel 24.hours put user_block_path(block, :user_block_period => "48", :user_block => { :needs_view => false, :reason => "Testing deactivates_at updated" }) block.reload - assert_equal Time.now.utc + 2.days, block.ends_at - assert_equal Time.now.utc + 2.days, block.deactivates_at + assert_equal Time.now.utc + 48.hours, block.ends_at + assert_equal Time.now.utc + 48.hours, block.deactivates_at end end @@ -709,16 +676,16 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest :user_block => { :needs_view => false, :reason => "Testing deactivates_at" }) end block = UserBlock.last - assert_equal Time.now.utc + 1.day, block.ends_at - assert_equal Time.now.utc + 1.day, block.deactivates_at + assert_equal Time.now.utc + 24.hours, block.ends_at + assert_equal Time.now.utc + 24.hours, block.deactivates_at - travel 2.days + travel 48.hours put user_block_path(block, :user_block_period => "0", :user_block => { :needs_view => false, :reason => "Testing deactivates_at updated" }) block.reload - assert_equal Time.now.utc - 1.day, block.ends_at - assert_equal Time.now.utc - 1.day, block.deactivates_at + assert_equal Time.now.utc - 24.hours, block.ends_at + assert_equal Time.now.utc - 24.hours, block.deactivates_at end end @@ -732,185 +699,21 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest block = UserBlock.new :user => blocked_user, :creator => moderator_user, :reason => "because", - :ends_at => Time.now.utc + 1.day, + :ends_at => Time.now.utc + 24.hours, :needs_view => false assert_difference "UserBlock.count", 1 do block.save :validate => false end - travel 2.days + travel 48.hours session_for(moderator_user) put user_block_path(block, :user_block_period => "0", :user_block => { :needs_view => false, :reason => "Testing legacy block update" }) block.reload - assert_equal Time.now.utc - 1.day, block.ends_at - assert_equal Time.now.utc - 1.day, block.deactivates_at - end - end - - ## - # 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 a bogus user name should fail - 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(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(blocked_user) - assert_response :success - 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(unblocked_user) - assert_response :success - 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 - - ## - # test the blocks_on action with multiple pages - def test_blocks_on_paged - user = create(:user) - user_blocks = create_list(:user_block, 50, :user => user).reverse - next_path = user_blocks_on_path(user) - - get next_path - assert_response :success - check_user_blocks_table user_blocks[0...20] - check_no_page_link "Newer Blocks" - next_path = check_page_link "Older Blocks" - - get next_path - assert_response :success - 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 - - ## - # 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 a bogus user name should fail - 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(moderator_user) - assert_response :success - 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 "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(normal_user) - assert_response :success - assert_select "table#block_list", false - assert_select "p", "#{normal_user.display_name} has not made any blocks yet." - end - - ## - # test the blocks_by action with multiple pages - def test_blocks_by_paged - user = create(:moderator_user) - user_blocks = create_list(:user_block, 50, :creator => user).reverse - next_path = user_blocks_by_path(user) - - get next_path - assert_response :success - check_user_blocks_table user_blocks[0...20] - check_no_page_link "Newer Blocks" - next_path = check_page_link "Older Blocks" - - get next_path - assert_response :success - 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 + assert_equal Time.now.utc - 24.hours, block.ends_at + assert_equal Time.now.utc - 24.hours, block.deactivates_at end end @@ -967,23 +770,4 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_equal "Updated Reason Again", block.reason assert_equal original_ends_at, block.ends_at end - - 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