diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-21 12:18:34 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-21 12:18:34 +0200 |
| commit | 71a3336dc4f241e00c006a222397e62b039672ed (patch) | |
| tree | 48d87e0f5c72ef9bfaa23d6dc2615e2b425fcb40 | |
| parent | 479814b29289ab5598117ff22b63e386a3d2d9f3 (diff) | |
| download | gitlab-ce-71a3336dc4f241e00c006a222397e62b039672ed.tar.gz | |
Cast duration to integer in `TimeHelper#time_interval_in_words`
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/helpers/time_helper.rb | 1 | ||||
| -rw-r--r-- | spec/helpers/time_helper_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/time_helper.rb b/app/helpers/time_helper.rb index 1926f03af07..790001222f1 100644 --- a/app/helpers/time_helper.rb +++ b/app/helpers/time_helper.rb @@ -1,5 +1,6 @@ module TimeHelper def time_interval_in_words(interval_in_seconds) + interval_in_seconds = interval_in_seconds.to_i minutes = interval_in_seconds / 60 seconds = interval_in_seconds - minutes * 60 diff --git a/spec/helpers/time_helper_spec.rb b/spec/helpers/time_helper_spec.rb index 413ead944b9..bf3ed5c094c 100644 --- a/spec/helpers/time_helper_spec.rb +++ b/spec/helpers/time_helper_spec.rb @@ -5,6 +5,7 @@ describe TimeHelper do it "returns minutes and seconds" do intervals_in_words = { 100 => "1 minute 40 seconds", + 100.32 => "1 minute 40 seconds", 121 => "2 minutes 1 second", 3721 => "62 minutes 1 second", 0 => "0 seconds" |