Merge branch…

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

Merge branch…
50d4050d · Phil Hughes · 5214e507 · a6713065 · 50d4050d
Commit 50d4050d authored Jun 20, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

datetime_utility_spec.js spec/javascripts/datetime_utility_spec.js +4 -0

No files found.
--- 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');