Merge remote-tracking branch 'upstream/pull/3397'

[rails.git] / 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 7d0b664fe2f0d7cebc8e4b409ad374af553c8a17..c4afa6c83b6e7e991d8ad8b869903af75d7932f9 100644 (file)
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -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