From 71be43588658a84dbf4d424a4e0084f38eaab9bf Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 9 Jun 2021 15:14:14 +0100 Subject: [PATCH] Fix case when user block durations are slightly negative The output from ActiveSupport::Duration is wildly unhelpful in those cases Fixes #3210 --- app/helpers/user_blocks_helper.rb | 2 ++ test/helpers/user_blocks_helper_test.rb | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/app/helpers/user_blocks_helper.rb b/app/helpers/user_blocks_helper.rb index 0528140f4..95b6cb600 100644 --- a/app/helpers/user_blocks_helper.rb +++ b/app/helpers/user_blocks_helper.rb @@ -26,6 +26,8 @@ module UserBlocksHelper end 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 if duration < 1.day t("user_blocks.helper.block_duration.hours", :count => parts.fetch(:hours, 0)) diff --git a/test/helpers/user_blocks_helper_test.rb b/test/helpers/user_blocks_helper_test.rb index 7d0b664fe..c4afa6c83 100644 --- 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 -- 2.39.5