Localisation updates from https://translatewiki.net.

[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 2e9d79ef759e8add899921259fc241ad3f37b3de..b172945ec056ea635a90973b0cb9c2627e9c89f7 100644 (file)
--- a/test/controllers/user_blocks_controller_test.rb
+++ b/test/controllers/user_blocks_controller_test.rb
@@ -352,10 +352,9 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
                             :user_block_period => "12",
                             :user_block => { :needs_view => false, :reason => "Vandalism" })
     end
                             :user_block_period => "12",
                             :user_block => { :needs_view => false, :reason => "Vandalism" })
     end

-    id = UserBlock.order(:id).ids.last
-    assert_redirected_to user_block_path(:id => id)
+    b = UserBlock.last
+    assert_redirected_to user_block_path(:id => b.id)

     assert_equal "Created a block on user #{target_user.display_name}.", flash[:notice]
     assert_equal "Created a block on user #{target_user.display_name}.", flash[:notice]

-    b = UserBlock.find(id)

     assert_in_delta Time.now.utc, b.created_at, 1
     assert_in_delta Time.now.utc, b.updated_at, 1
     assert_in_delta Time.now.utc + 12.hours, b.ends_at, 1
     assert_in_delta Time.now.utc, b.created_at, 1
     assert_in_delta Time.now.utc, b.updated_at, 1
     assert_in_delta Time.now.utc + 12.hours, b.ends_at, 1


@@ -388,7 +387,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
                           :user_block_period => "336",
                           :user_block => { :needs_view => false, :reason => "Vandalism" })
 
                           :user_block_period => "336",
                           :user_block => { :needs_view => false, :reason => "Vandalism" })
 

-    block = UserBlock.order(:id).last
+    block = UserBlock.last

     assert_equal 1209600, block.ends_at - block.created_at
   end
 
     assert_equal 1209600, block.ends_at - block.created_at
   end