diff options
| author | bikebilly <fabio@gitlab.com> | 2017-11-07 09:44:13 +0100 |
|---|---|---|
| committer | bikebilly <fabio@gitlab.com> | 2017-11-07 09:44:13 +0100 |
| commit | a40bb17688f4d2983c22929cfbb1d888c2a6e68c (patch) | |
| tree | 90d8c6d008affa2b774b6f2a958355a419283285 /spec/javascripts/lib/utils/datefix_spec.js | |
| parent | ad9c0bae5f573fb14410d421247814673ea9e690 (diff) | |
| parent | e99ddb6f374c9f79c1c78e808c5e9bd983bed227 (diff) | |
| download | gitlab-ce-a40bb17688f4d2983c22929cfbb1d888c2a6e68c.tar.gz | |
Resolve conflicts
Diffstat (limited to 'spec/javascripts/lib/utils/datefix_spec.js')
| -rw-r--r-- | spec/javascripts/lib/utils/datefix_spec.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/spec/javascripts/lib/utils/datefix_spec.js b/spec/javascripts/lib/utils/datefix_spec.js index 0b9fde2be67..e58ac4300ba 100644 --- a/spec/javascripts/lib/utils/datefix_spec.js +++ b/spec/javascripts/lib/utils/datefix_spec.js @@ -1,4 +1,4 @@ -import { pad, parsePikadayDate, pikadayToString } from '~/lib/utils/datefix'; +import { pad, pikadayToString } from '~/lib/utils/datefix'; describe('datefix', () => { describe('pad', () => { @@ -16,9 +16,7 @@ describe('datefix', () => { }); describe('parsePikadayDate', () => { - it('should return a UTC date', () => { - expect(parsePikadayDate('2020-01-29')).toEqual(new Date('2020-01-29')); - }); + // removed because of https://gitlab.com/gitlab-org/gitlab-ce/issues/39834 }); describe('pikadayToString', () => { |