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

Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2021-04-30 03:10:13 +00:00
parent 926b29e5fa
commit 7fd6d7b43b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue
View File

@ -237,13 +237,14 @@ export default {
:data-testid="dataTestId"
@open="openDatePicker"
>
<template #title-extra>
<template v-if="canInherit" #title-extra>
<gl-icon
ref="epicDatePopover"
name="question-o"
class="gl-ml-3 gl-cursor-pointer gl-text-blue-600"
class="gl-ml-3 gl-cursor-pointer gl-text-blue-600 hide-collapsed"
tabindex="0"
:aria-label="$options.i18n.help"
data-testid="inherit-date-popover"
/>
<gl-popover
:target="() => $refs.epicDatePopover.$el"

13
spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
View File

@ -22,6 +22,7 @@ describe('Sidebar date Widget', () => {
const date = '2021-04-15';
const findEditableItem = () => wrapper.findComponent(SidebarEditableItem);
const findPopoverIcon = () => wrapper.find('[data-testid="inherit-date-popover"]');
const createComponent = ({
dueDateQueryHandler = jest.fn().mockResolvedValue(issuableDueDateResponse()),
@ -70,6 +71,12 @@ describe('Sidebar date Widget', () => {
expect(wrapper.text()).toContain('Due date');
});
it('does not display icon popover by default', () => {
createComponent();
expect(findPopoverIcon().exists()).toBe(false);
});
describe('when issuable has no due date', () => {
beforeEach(async () => {
createComponent({
@ -146,4 +153,10 @@ describe('Sidebar date Widget', () => {
expect(wrapper.emitted(event)).toEqual([[date]]);
},
);
it('displays icon popover when issuable can inherit date', () => {
createComponent({ canInherit: true });
expect(findPopoverIcon().exists()).toBe(true);
});
});