root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Do not omit leading zeros in duration_in_numbers helper

This commit is contained in:
Winnie Hellmann 2018-10-01 12:55:09 +02:00 committed by Alessio Caiazza
parent 6369ff1ce1
commit 786ae68367
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/helpers/time_helper.rb
View File

@ -27,11 +27,7 @@ module TimeHelper
minutes = (duration_in_seconds / 1.minute) % (1.hour / 1.minute) minutes = (duration_in_seconds / 1.minute) % (1.hour / 1.minute)
hours = duration_in_seconds / 1.hour hours = duration_in_seconds / 1.hour
if hours == 0 "%02d:%02d:%02d" % [hours, minutes, seconds]
"%02d:%02d" % [minutes, seconds]
else
"%02d:%02d:%02d" % [hours, minutes, seconds]
end
else else
time_format = duration_in_seconds < 1.hour ? "%M:%S" : "%H:%M:%S" time_format = duration_in_seconds < 1.hour ? "%M:%S" : "%H:%M:%S"

8
spec/helpers/time_helper_spec.rb
View File

@ -39,10 +39,10 @@ describe TimeHelper do
context "with allow_overflow = true" do context "with allow_overflow = true" do
where(:duration, :formatted_string) do where(:duration, :formatted_string) do
0 | "00:00" 0 | "00:00:00"
1.second | "00:01" 1.second | "00:00:01"
42.seconds | "00:42" 42.seconds | "00:00:42"
2.minutes + 1.second | "02:01" 2.minutes + 1.second | "00:02:01"
3.hours + 2.minutes + 1.second | "03:02:01" 3.hours + 2.minutes + 1.second | "03:02:01"
30.hours | "30:00:00" 30.hours | "30:00:00"
end end