summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-06-20 07:56:49 +0000
committerPhil Hughes <me@iamphill.com>2017-06-20 07:56:49 +0000
commit50d4050d7e14d6c89132c7c3844f4fe6bab708cd (patch)
treedf3227cee48cb0a45735bcfc99e091b4021dc4ab
parent5214e507b043c8e71d2826252491cdac97d27416 (diff)
parenta67130655aa89cc55a352bb9ca10349e588955c8 (diff)
downloadgitlab-ce-50d4050d7e14d6c89132c7c3844f4fe6bab708cd.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.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/javascripts/datetime_utility_spec.js b/spec/javascripts/datetime_utility_spec.js
index e54ea11b08c..3391cade541 100644
--- a/spec/javascripts/datetime_utility_spec.js
+++ b/spec/javascripts/datetime_utility_spec.js
@@ -16,6 +16,10 @@ import { timeIntervalInWords } from '~/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');