kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '55402-broken-master-karma-test-failing-in-spec-javascripts-boards-components-issue_due_date_spec-js' into 'master' 

Resolve "Broken master: karma test failing in spec/javascripts/boards/components/issue_due_date_spec.js"

Closes #55402

See merge request gitlab-org/gitlab-ce!23845
This commit is contained in:
Stan Hu 2018-12-16 01:11:16 +00:00
parent 8d2e1b724b 60295c1430
commit 8b4602041c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/55402-broken-master-karma-test-failing-in-spec-javascripts-boards-components-issue_due_date_spec-js.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix due date test
merge_request: 23845
author:
type: other

7
spec/javascripts/boards/components/issue_due_date_spec.js
View File

@ -49,10 +49,11 @@ describe('Issue Due Date component', () => {
it('should render month and day for other dates', () => {
date.setDate(date.getDate() + 17);
vm = createComponent(date);
const today = new Date();
const isDueInCurrentYear = today.getFullYear() === date.getFullYear();
const format = isDueInCurrentYear ? 'mmm d' : 'mmm d, yyyy';
expect(vm.$el.querySelector('time').textContent.trim()).toEqual(
dateFormat(date, 'mmm d', true),
);
expect(vm.$el.querySelector('time').textContent.trim()).toEqual(dateFormat(date, format, true));
});
it('should contain the correct `.text-danger` css class for overdue issue', () => {