X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5f2a5cadcb693b34b81a9232b8879c3b4f12843d..8aeb16a50c3cd55c953aaec8dcc2b881fb132c88:/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 ed310f52e..183bc9b7b 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -123,38 +123,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 +293,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 +307,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 +338,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 +352,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 +421,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 +466,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 +481,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 +500,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." @@ -636,15 +694,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 +718,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 +742,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 +767,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,21 +790,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 + assert_equal Time.now.utc - 24.hours, block.ends_at + assert_equal Time.now.utc - 24.hours, block.deactivates_at end end