Commit 868a7002 authored by Simon Knox's avatar Simon Knox

Merge branch 'dont-show-due-date-in-red-on-epic-related-issue' into 'master'

Dont show due date in red on epic related issues

See merge request gitlab-org/gitlab!67492
parents 80c745a3 debe45db
...@@ -254,6 +254,7 @@ export default { ...@@ -254,6 +254,7 @@ export default {
<item-due-date <item-due-date
v-if="item.dueDate" v-if="item.dueDate"
:date="item.dueDate" :date="item.dueDate"
:closed="Boolean(item.closedAt)"
tooltip-placement="top" tooltip-placement="top"
css-class="item-due-date gl-display-flex gl-align-items-center gl-mr-5!" css-class="item-due-date gl-display-flex gl-align-items-center gl-mr-5!"
/> />
......
...@@ -361,6 +361,19 @@ describe('RelatedItemsTree', () => { ...@@ -361,6 +361,19 @@ describe('RelatedItemsTree', () => {
expect(dueDate.isVisible()).toBe(true); expect(dueDate.isVisible()).toBe(true);
}); });
it('does not render red icon for overdue issue that is closed', async () => {
wrapper.setProps({
item: {
...mockItem,
closedAt: '2018-12-01T00:00:00.00Z',
},
});
await wrapper.vm.$nextTick();
expect(wrapper.find(ItemDueDate).props('closed')).toBe(true);
});
it('renders item weight when it has weight', () => { it('renders item weight when it has weight', () => {
const weight = wrapper.find(ItemWeight); const weight = wrapper.find(ItemWeight);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment