Ensure that short duration blockss are shown as '0 hours'

Passing `:count => nil` means that i18n.t will return the hash of translations, so use a default value of 0 when checking for hours to prevent this.

Refs #3210

diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb
index 73425edec4b028f1752cf109bc199fa20a58b32b..0528140f4cd8bbad5a4627f5eb2fa1c886e014e5 100644 (file)
--- a/app/helpers/user_blocks_helper.rb
+++ b/app/helpers/user_blocks_helper.rb
@@ -28,7 +28,7 @@ module UserBlocksHelper
   def block_duration_in_words(duration)
     parts = ActiveSupport::Duration.build(duration).parts
     if duration < 1.day
   def block_duration_in_words(duration)
     parts = ActiveSupport::Duration.build(duration).parts
     if duration < 1.day

-      t("user_blocks.helper.block_duration.hours", :count => parts[:hours])
+      t("user_blocks.helper.block_duration.hours", :count => parts.fetch(:hours, 0))

     elsif duration < 1.week
       t("user_blocks.helper.block_duration.days", :count => parts[:days])
     elsif duration < 1.month
     elsif duration < 1.week
       t("user_blocks.helper.block_duration.days", :count => parts[:days])
     elsif duration < 1.month

diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb
index 16f83ec89a64930d2af1c225fea36e43f6f55dd9..7d0b664fe2f0d7cebc8e4b409ad374af553c8a17 100644 (file)
--- a/test/helpers/user_blocks_helper_test.rb
+++ b/test/helpers/user_blocks_helper_test.rb
@@ -13,4 +13,19 @@ class UserBlocksHelperTest < ActionView::TestCase
     block = create(:user_block, :ends_at => Time.now.getutc + 1.hour)
     assert_match %r{^Ends in <span title=".*">about 1 hour</span>\.$}, block_status(block)
   end
     block = create(:user_block, :ends_at => Time.now.getutc + 1.hour)
     assert_match %r{^Ends in <span title=".*">about 1 hour</span>\.$}, 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
+  end

 end
 end