diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-20 07:56:49 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-04 19:38:11 +0100 |
| commit | ca02e0e0d11964d5f958b5670f7140bc654cfadb (patch) | |
| tree | bd581e8838247e7ba559e1aeccc79144c09e627c | |
| parent | 57eaae56a891fb7fb24b597e3d4f1f1e8c75e1aa (diff) | |
| download | gitlab-ce-ca02e0e0d11964d5f958b5670f7140bc654cfadb.tar.gz | |
Merge branch '33734-transient-karma-failure-on-master-for-date-time-utils-timefor-returns-remaining-time-when-in-the-future' into 'master'
Resolve "Transient karma failure on master for `Date time utils timeFor returns remaining time when in the future`"
Closes #33734
See merge request !12227
| -rw-r--r-- | spec/javascripts/datetime_utility_spec.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/javascripts/datetime_utility_spec.js b/spec/javascripts/datetime_utility_spec.js index c82ad0bea48..864237b4527 100644 --- a/spec/javascripts/datetime_utility_spec.js +++ b/spec/javascripts/datetime_utility_spec.js @@ -16,6 +16,10 @@ import '~/lib/utils/datetime_utility'; const date = new Date(); date.setFullYear(date.getFullYear() + 1); + // Add a day to prevent a transient error. If date is even 1 second + // short of a full year, timeFor will return '11 months remaining' + date.setDate(date.getDate() + 1); + expect( gl.utils.timeFor(date), ).toBe('1 year remaining'); |