cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2021-06-09 17:46:11 +01:00
commit 616f3783df
2 changed files with 23 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/user_blocks_helper.rb
View file

@ -26,9 +26,11 @@ module UserBlocksHelper
end end
def block_duration_in_words(duration) def block_duration_in_words(duration)
# Ensure the requested duration isn't negative, even by a millisecond
duration = 0 if duration.negative?
parts = ActiveSupport::Duration.build(duration).parts parts = ActiveSupport::Duration.build(duration).parts
if duration < 1.day 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 elsif duration < 1.week
t("user_blocks.helper.block_duration.days", :count => parts[:days]) t("user_blocks.helper.block_duration.days", :count => parts[:days])
elsif duration < 1.month elsif duration < 1.month

20
test/helpers/user_blocks_helper_test.rb
View file

@ -13,4 +13,24 @@ class UserBlocksHelperTest < ActionView::TestCase
block = create(:user_block, :ends_at => Time.now.getutc + 1.hour) 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) assert_match %r{^Ends in <span title=".*">about 1 hour</span>\.$}, block_status(block)
end 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 end