X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5ce14cfa4d7792346e96a3895df73e3510c936ea..507c395f51c20c3c0d5375313ea1ca0ed4156c75:/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 7d0b664fe..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
@@ -27,5 +27,10 @@ class UserBlocksHelperTest < ActionView::TestCase
words = block_duration_in_words(0)
assert_equal "0 hours", words
+
+ # Ensure that (slightly) negative durations don't mess everything up
+ # This can happen on zero hour blocks when ends_at is a millisecond before created_at
+ words = block_duration_in_words(-0.001)
+ assert_equal "0 hours", words
end
end