summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-12-07 20:44:46 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-12-07 20:44:46 +0000
commit4824c0ff10681126845931dc5efa01c734e1d853 (patch)
tree0c0bdde9a16a2d528d6ff0004f994f179684e686
parent7838317a14ddb686a16e914f9dbfb393a6bf5099 (diff)
parentc4c06a33f91ca56b2c30b7521708c34089ed43f7 (diff)
downloadgitlab-ce-4824c0ff10681126845931dc5efa01c734e1d853.tar.gz
Merge branch 'fix-transient-datefix-spec' into 'master'
Fix transient error in pikadayToString Closes #40858 See merge request gitlab-org/gitlab-ce!15754
-rw-r--r--spec/javascripts/lib/utils/datefix_spec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/lib/utils/datefix_spec.js b/spec/javascripts/lib/utils/datefix_spec.js
index e58ac4300ba..a9f3abcf2a4 100644
--- a/spec/javascripts/lib/utils/datefix_spec.js
+++ b/spec/javascripts/lib/utils/datefix_spec.js
@@ -21,7 +21,7 @@ describe('datefix', () => {
describe('pikadayToString', () => {
it('should format a UTC date into yyyy-mm-dd format', () => {
- expect(pikadayToString(new Date('2020-01-29'))).toEqual('2020-01-29');
+ expect(pikadayToString(new Date('2020-01-29:00:00'))).toEqual('2020-01-29');
});
});
});