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

[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 6d99db1cd0115b01dfbbc54e3e14d1c52ea0303d..1d89476ec6d10aea552cd3c8e283385064af1be1 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -33,10 +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 => :post },
-      { :controller => "user_blocks", :action => "revoke", :id => "1" }
-    )
 
     assert_routing(
       { :path => "/user/username/blocks", :method => :get },
@@ -549,21 +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)
-
-    # Login as a moderator
-    session_for(create(:moderator_user))
-
-    # 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
-  end
-
   ##
   # test the revoke all page
   def test_revoke_all_page
@@ -655,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
 
@@ -679,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
@@ -703,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
 
@@ -728,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
 
@@ -751,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