X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9018d1af07c53b03bf8caf0480b931dc25f57147..8a020b3ec727b8c9fa4d819855469dd348e58ee7:/test/helpers/user_blocks_helper_test.rb diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb index c4afa6c83..db4fd87a4 100644 --- a/test/helpers/user_blocks_helper_test.rb +++ b/test/helpers/user_blocks_helper_test.rb @@ -4,14 +4,14 @@ 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) - assert_match %r{^Ends in about 1 hour and after the user has logged in\.$}, block_status(block) + block = create(:user_block, :needs_view, :ends_at => Time.now.utc + 1.hour) + assert_match %r{^Ends in and after the user has logged in\.$}, block_status(block) - block = create(:user_block, :ends_at => Time.now.getutc + 1.hour) - assert_match %r{^Ends in about 1 hour\.$}, block_status(block) + block = create(:user_block, :ends_at => Time.now.utc + 1.hour) + assert_match %r{^Ends in \.$}, block_status(block) end def test_block_duration_in_words