kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update time_helper.rb to fix output for exact minutes.

Browse source
This commit is contained in:
Marcel Amirault 2018-07-10 10:49:28 +00:00 committed by Rémy Coutable
parent 7407efe19c
commit 8aac79be53
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/helpers/time_helper.rb
View file

@ -5,9 +5,13 @@ module TimeHelper
seconds = interval_in_seconds - minutes * 60 seconds = interval_in_seconds - minutes * 60
if minutes >= 1 if minutes >= 1
"#{pluralize(minutes, "minute")} #{pluralize(seconds, "second")}" if seconds % 60 == 0
pluralize(minutes, "minute")
else
[pluralize(minutes, "minute"), pluralize(seconds, "second")].to_sentence
end
else else
"#{pluralize(seconds, "second")}" pluralize(seconds, "second")
end end
end end

10
spec/helpers/time_helper_spec.rb
View file

@ -4,10 +4,12 @@ describe TimeHelper do
describe "#time_interval_in_words" do describe "#time_interval_in_words" do
it "returns minutes and seconds" do it "returns minutes and seconds" do
intervals_in_words = { intervals_in_words = {
100 => "1 minute 40 seconds", 60 => "1 minute",
100.32 => "1 minute 40 seconds", 100 => "1 minute and 40 seconds",
121 => "2 minutes 1 second", 100.32 => "1 minute and 40 seconds",
3721 => "62 minutes 1 second", 120 => "2 minutes",
121 => "2 minutes and 1 second",
3721 => "62 minutes and 1 second",
0 => "0 seconds" 0 => "0 seconds"
} }