diff options
author | Marcel Amirault <ravlen@gmail.com> | 2018-07-10 10:49:28 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-07-10 10:49:28 +0000 |
commit | 8aac79be5311ff6e545f9756a60b4b1c07885a76 (patch) | |
tree | 0aeb60d6e787146e7ea14d3bd20901a29c05d61e /spec | |
parent | 7407efe19cab09a14147e8acc88213274694b614 (diff) | |
download | gitlab-ce-8aac79be5311ff6e545f9756a60b4b1c07885a76.tar.gz |
Update time_helper.rb to fix output for exact minutes.
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/time_helper_spec.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/spec/helpers/time_helper_spec.rb b/spec/helpers/time_helper_spec.rb index 21f35585367..0b371d69ecf 100644 --- a/spec/helpers/time_helper_spec.rb +++ b/spec/helpers/time_helper_spec.rb @@ -4,10 +4,12 @@ describe TimeHelper do describe "#time_interval_in_words" 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", + 60 => "1 minute", + 100 => "1 minute and 40 seconds", + 100.32 => "1 minute and 40 seconds", + 120 => "2 minutes", + 121 => "2 minutes and 1 second", + 3721 => "62 minutes and 1 second", 0 => "0 seconds" } |