]> git.openstreetmap.org Git - rails.git/blobdiff - test/helpers/user_blocks_helper_test.rb
Merge remote-tracking branch 'upstream/pull/3769'
[rails.git] / test / helpers / user_blocks_helper_test.rb
index c4afa6c83b6e7e991d8ad8b869903af75d7932f9..0c2ab42b5810ad13683a5e317ea43fd81964ecdf 100644 (file)
@@ -4,13 +4,13 @@ class UserBlocksHelperTest < ActionView::TestCase
   include ApplicationHelper
 
   def test_block_status
-    block = create(:user_block, :needs_view, :ends_at => Time.now.getutc)
+    block = create(:user_block, :needs_view, :ends_at => Time.now.utc)
     assert_equal "Active until the user logs in.", block_status(block)
 
-    block = create(:user_block, :needs_view, :ends_at => Time.now.getutc + 1.hour)
+    block = create(:user_block, :needs_view, :ends_at => Time.now.utc + 1.hour)
     assert_match %r{^Ends in <span title=".*">about 1 hour</span> and after the user has logged in\.$}, block_status(block)
 
-    block = create(:user_block, :ends_at => Time.now.getutc + 1.hour)
+    block = create(:user_block, :ends_at => Time.now.utc + 1.hour)
     assert_match %r{^Ends in <span title=".*">about 1 hour</span>\.$}, block_status(block)
   end