Merge remote-tracking branch 'upstream/pull/5292'

[rails.git] / 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 61440ae56ad9e7e4f545f5b837b26b406ba581b1..1d89476ec6d10aea552cd3c8e283385064af1be1 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -33,14 +33,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
       { :path => "/user_blocks/1", :method => :delete },
       { :controller => "user_blocks", :action => "destroy", :id => "1" }
     )
-    assert_routing(
-      { :path => "/blocks/1/revoke", :method => :get },
-      { :controller => "user_blocks", :action => "revoke", :id => "1" }
-    )
-    assert_routing(
-      { :path => "/blocks/1/revoke", :method => :post },
-      { :controller => "user_blocks", :action => "revoke", :id => "1" }
-    )
 
     assert_routing(
       { :path => "/user/username/blocks", :method => :get },
@@ -173,10 +165,10 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     block = create(:user_block, :creator => creator_user)
 
     session_for(other_moderator_user)
-    check_block_buttons block, :edit => 1, :revoke => 1
+    check_block_buttons block, :edit => 1
 
     session_for(creator_user)
-    check_block_buttons block, :edit => 1, :revoke => 1
+    check_block_buttons block, :edit => 1
   end
 
   ##
@@ -553,55 +545,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
     assert_equal other_moderator_user, block.revoker
   end
 
-  ##
-  # test the revoke action
-  def test_revoke
-    active_block = create(:user_block)
-
-    # Check that the block revoke page requires us to login
-    get revoke_user_block_path(:id => active_block)
-    assert_redirected_to login_path(:referer => revoke_user_block_path(:id => active_block))
-
-    # Login as a normal user
-    session_for(create(:user))
-
-    # Check that normal users can't load the block revoke page
-    get revoke_user_block_path(:id => active_block)
-    assert_redirected_to :controller => "errors", :action => "forbidden"
-
-    # Login as a moderator
-    session_for(create(:moderator_user))
-
-    # Check that the block revoke page loads for moderators
-    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
-    end
-
-    # Check that revoking a block using GET should fail
-    get revoke_user_block_path(:id => active_block, :confirm => true)
-    assert_response :success
-    assert_template "revoke"
-    b = UserBlock.find(active_block.id)
-    assert_operator b.ends_at - Time.now.utc, :>, 100
-
-    # Check that revoking a block works using POST
-    post revoke_user_block_path(:id => active_block, :confirm => true)
-    assert_redirected_to user_block_path(active_block)
-    b = UserBlock.find(active_block.id)
-    assert_in_delta Time.now.utc, b.ends_at, 1
-
-    # We should get an error if the block doesn't exist
-    get revoke_user_block_path(:id => 99999)
-    assert_response :not_found
-    assert_template "not_found"
-    assert_select "p", "Sorry, the user block with ID 99999 could not be found."
-  end
-
   ##
   # test the revoke all page
   def test_revoke_all_page
@@ -693,15 +636,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
 
@@ -717,14 +660,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
@@ -741,16 +684,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
 
@@ -766,16 +709,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
 
@@ -789,21 +732,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
 
@@ -973,12 +916,11 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
 
   private
 
-  def check_block_buttons(block, edit: 0, revoke: 0)
+  def check_block_buttons(block, edit: 0)
     [user_blocks_path, user_block_path(block)].each do |path|
       get path
       assert_response :success
       assert_select "a[href='#{edit_user_block_path block}']", :count => edit
-      assert_select "a[href='#{revoke_user_block_path block}']", :count => revoke
     end
   end