X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d52424087b0c7f2c6c86692a2ea9d72ae601491c..43ce6e68c09cdb4e66a7af9849e36c9406d2eb05:/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 16f83ec89..db4fd87a4 100644
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -4,13 +4,33 @@ 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
+ words = block_duration_in_words(364.days)
+ assert_equal "11 months", words
+
+ words = block_duration_in_words(24.hours)
+ assert_equal "1 day", words
+
+ # Ensure that nil hours is not passed to i18n.t
+ words = block_duration_in_words(10.minutes)
+ assert_equal "0 hours", words
+
+ 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