Add latest changes from gitlab-org/gitlab@master

4 files changed, 15 insertions, 243 deletions

diff --git a/spec/frontend/boards/components/sidebar/board_sidebar_milestone_select_spec.js b/spec/frontend/boards/components/sidebar/board_sidebar_milestone_select_spec.js
deleted file mode 100644
index 6cf750be972..00000000000
--- a/spec/frontend/boards/components/sidebar/board_sidebar_milestone_select_spec.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import { GlLoadingIcon, GlDropdown } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
-import { mockMilestone as TEST_MILESTONE } from 'jest/boards/mock_data';
-import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
-import BoardSidebarMilestoneSelect from '~/boards/components/sidebar/board_sidebar_milestone_select.vue';
-import { createStore } from '~/boards/stores';
-
-const TEST_ISSUE = { id: 'gid://gitlab/Issue/1', iid: 9, referencePath: 'h/b#2' };
-
-describe('~/boards/components/sidebar/board_sidebar_milestone_select.vue', () => {
-  let wrapper;
-  let store;
-
-  afterEach(() => {
-    wrapper.destroy();
-    store = null;
-    wrapper = null;
-  });
-
-  const createWrapper = ({ milestone = null, loading = false } = {}) => {
-    store = createStore();
-    store.state.boardItems = { [TEST_ISSUE.id]: { ...TEST_ISSUE, milestone } };
-    store.state.activeId = TEST_ISSUE.id;
-
-    wrapper = shallowMount(BoardSidebarMilestoneSelect, {
-      store,
-      provide: {
-        canUpdate: true,
-      },
-      data: () => ({
-        milestones: [TEST_MILESTONE],
-      }),
-      stubs: {
-        'board-editable-item': BoardEditableItem,
-      },
-      mocks: {
-        $apollo: {
-          loading,
-        },
-      },
-    });
-  };
-
-  const findCollapsed = () => wrapper.find('[data-testid="collapsed-content"]');
-  const findLoader = () => wrapper.find(GlLoadingIcon);
-  const findDropdown = () => wrapper.find(GlDropdown);
-  const findBoardEditableItem = () => wrapper.find(BoardEditableItem);
-  const findDropdownItem = () => wrapper.find('[data-testid="milestone-item"]');
-  const findUnsetMilestoneItem = () => wrapper.find('[data-testid="no-milestone-item"]');
-  const findNoMilestonesFoundItem = () => wrapper.find('[data-testid="no-milestones-found"]');
-
-  describe('when not editing', () => {
-    it('opens the milestone dropdown on clicking edit', async () => {
-      createWrapper();
-      wrapper.vm.$refs.dropdown.show = jest.fn();
-
-      await findBoardEditableItem().vm.$emit('open');
-
-      expect(wrapper.vm.$refs.dropdown.show).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  describe('when editing', () => {
-    beforeEach(() => {
-      createWrapper();
-      jest.spyOn(wrapper.vm.$refs.sidebarItem, 'collapse');
-    });
-
-    it('collapses BoardEditableItem on clicking edit', async () => {
-      await findBoardEditableItem().vm.$emit('close');
-
-      expect(wrapper.vm.$refs.sidebarItem.collapse).toHaveBeenCalledTimes(1);
-    });
-
-    it('collapses BoardEditableItem on hiding dropdown', async () => {
-      await findDropdown().vm.$emit('hide');
-
-      expect(wrapper.vm.$refs.sidebarItem.collapse).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  it('renders "None" when no milestone is selected', () => {
-    createWrapper();
-
-    expect(findCollapsed().text()).toBe('None');
-  });
-
-  it('renders milestone title when set', () => {
-    createWrapper({ milestone: TEST_MILESTONE });
-
-    expect(findCollapsed().text()).toContain(TEST_MILESTONE.title);
-  });
-
-  it('shows loader while Apollo is loading', async () => {
-    createWrapper({ milestone: TEST_MILESTONE, loading: true });
-
-    expect(findLoader().exists()).toBe(true);
-  });
-
-  it('shows message when error or no milestones found', async () => {
-    createWrapper();
-
-    await wrapper.setData({ milestones: [] });
-
-    expect(findNoMilestonesFoundItem().text()).toBe('No milestones found');
-  });
-
-  describe('when milestone is selected', () => {
-    beforeEach(async () => {
-      createWrapper();
-
-      jest.spyOn(wrapper.vm, 'setActiveIssueMilestone').mockImplementation(() => {
-        store.state.boardItems[TEST_ISSUE.id].milestone = TEST_MILESTONE;
-      });
-      findDropdownItem().vm.$emit('click');
-      await wrapper.vm.$nextTick();
-    });
-
-    it('collapses sidebar and renders selected milestone', () => {
-      expect(findCollapsed().isVisible()).toBe(true);
-      expect(findCollapsed().text()).toContain(TEST_MILESTONE.title);
-    });
-
-    it('commits change to the server', () => {
-      expect(wrapper.vm.setActiveIssueMilestone).toHaveBeenCalledWith({
-        milestoneId: TEST_MILESTONE.id,
-        projectPath: 'h/b',
-      });
-    });
-  });
-
-  describe('when milestone is set to "None"', () => {
-    beforeEach(async () => {
-      createWrapper({ milestone: TEST_MILESTONE });
-
-      jest.spyOn(wrapper.vm, 'setActiveIssueMilestone').mockImplementation(() => {
-        store.state.boardItems[TEST_ISSUE.id].milestone = null;
-      });
-      findUnsetMilestoneItem().vm.$emit('click');
-      await wrapper.vm.$nextTick();
-    });
-
-    it('collapses sidebar and renders "None"', () => {
-      expect(findCollapsed().isVisible()).toBe(true);
-      expect(findCollapsed().text()).toBe('None');
-    });
-
-    it('commits change to the server', () => {
-      expect(wrapper.vm.setActiveIssueMilestone).toHaveBeenCalledWith({
-        milestoneId: null,
-        projectPath: 'h/b',
-      });
-    });
-  });
-
-  describe('when the mutation fails', () => {
-    const testMilestone = { id: '1', title: 'Former milestone' };
-
-    beforeEach(async () => {
-      createWrapper({ milestone: testMilestone });
-
-      jest.spyOn(wrapper.vm, 'setActiveIssueMilestone').mockImplementation(() => {
-        throw new Error(['failed mutation']);
-      });
-      jest.spyOn(wrapper.vm, 'setError').mockImplementation(() => {});
-      findDropdownItem().vm.$emit('click');
-      await wrapper.vm.$nextTick();
-    });
-
-    it('collapses sidebar and renders former milestone', () => {
-      expect(findCollapsed().isVisible()).toBe(true);
-      expect(findCollapsed().text()).toContain(testMilestone.title);
-      expect(wrapper.vm.setError).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index ad69dd4775a..63569333408 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -30,7 +30,6 @@ import {
   mockIssue2,
   rawIssue,
   mockIssues,
-  mockMilestone,
   labels,
   mockActiveIssue,
   mockGroupProjects,
@@ -1495,60 +1494,6 @@ describe('setActiveItemSubscribed', () => {
   });
 });
 
-describe('setActiveIssueMilestone', () => {
-  const state = { boardItems: { [mockIssue.id]: mockIssue } };
-  const getters = { activeBoardItem: mockIssue };
-  const testMilestone = {
-    ...mockMilestone,
-    id: 'gid://gitlab/Milestone/1',
-  };
-  const input = {
-    milestoneId: testMilestone.id,
-    projectPath: 'h/b',
-  };
-
-  it('should commit milestone after setting the issue', (done) => {
-    jest.spyOn(gqlClient, 'mutate').mockResolvedValue({
-      data: {
-        updateIssue: {
-          issue: {
-            milestone: testMilestone,
-          },
-          errors: [],
-        },
-      },
-    });
-
-    const payload = {
-      itemId: getters.activeBoardItem.id,
-      prop: 'milestone',
-      value: testMilestone,
-    };
-
-    testAction(
-      actions.setActiveIssueMilestone,
-      input,
-      { ...state, ...getters },
-      [
-        {
-          type: types.UPDATE_BOARD_ITEM_BY_ID,
-          payload,
-        },
-      ],
-      [],
-      done,
-    );
-  });
-
-  it('throws error if fails', async () => {
-    jest
-      .spyOn(gqlClient, 'mutate')
-      .mockResolvedValue({ data: { updateIssue: { errors: ['failed mutation'] } } });
-
-    await expect(actions.setActiveIssueMilestone({ getters }, input)).rejects.toThrow(Error);
-  });
-});
-
 describe('setActiveItemTitle', () => {
   const state = {
     boardItems: { [mockIssue.id]: mockIssue },
diff --git a/spec/frontend/invite_members/components/invite_members_trigger_spec.js b/spec/frontend/invite_members/components/invite_members_trigger_spec.js
index b569b6286e0..f57af61ad5b 100644
--- a/spec/frontend/invite_members/components/invite_members_trigger_spec.js
+++ b/spec/frontend/invite_members/components/invite_members_trigger_spec.js
@@ -7,6 +7,8 @@ import eventHub from '~/invite_members/event_hub';
 jest.mock('~/experimentation/experiment_tracking');
 
 const displayText = 'Invite team members';
+const triggerSource = '_trigger_source_';
+
 let wrapper;
 let triggerProps;
 let findButton;
@@ -26,7 +28,7 @@ const createComponent = (props = {}) => {
 };
 
 describe.each(['button', 'anchor'])('with triggerElement as %s', (triggerElement) => {
-  triggerProps = { triggerElement };
+  triggerProps = { triggerElement, triggerSource };
   findButton = () => wrapper.findComponent(triggerComponent[triggerElement]);
 
   afterEach(() => {
@@ -48,22 +50,14 @@ describe.each(['button', 'anchor'])('with triggerElement as %s', (triggerElement
       spy = jest.spyOn(eventHub, '$emit');
     });
 
-    it('emits openModal from an unknown source', () => {
-      createComponent();
-
-      findButton().vm.$emit('click');
-
-      expect(spy).toHaveBeenCalledWith('openModal', { inviteeType: 'members', source: 'unknown' });
-    });
-
     it('emits openModal from a named source', () => {
-      createComponent({ triggerSource: '_trigger_source_' });
+      createComponent();
 
       findButton().vm.$emit('click');
 
       expect(spy).toHaveBeenCalledWith('openModal', {
         inviteeType: 'members',
-        source: '_trigger_source_',
+        source: triggerSource,
       });
     });
   });
diff --git a/spec/frontend/sidebar/components/assignees/sidebar_invite_members_spec.js b/spec/frontend/sidebar/components/assignees/sidebar_invite_members_spec.js
index cfbe7227915..b738d931040 100644
--- a/spec/frontend/sidebar/components/assignees/sidebar_invite_members_spec.js
+++ b/spec/frontend/sidebar/components/assignees/sidebar_invite_members_spec.js
@@ -4,11 +4,16 @@ import SidebarInviteMembers from '~/sidebar/components/assignees/sidebar_invite_
 
 describe('Sidebar invite members component', () => {
   let wrapper;
+  const issuableType = 'issue';
 
   const findDirectInviteLink = () => wrapper.findComponent(InviteMembersTrigger);
 
   const createComponent = () => {
-    wrapper = shallowMount(SidebarInviteMembers);
+    wrapper = shallowMount(SidebarInviteMembers, {
+      propsData: {
+        issuableType,
+      },
+    });
   };
 
   afterEach(() => {
@@ -23,5 +28,9 @@ describe('Sidebar invite members component', () => {
     it('renders a direct link to project members path', () => {
       expect(findDirectInviteLink().exists()).toBe(true);
     });
+
+    it('has expected attributes on the trigger', () => {
+      expect(findDirectInviteLink().props('triggerSource')).toBe('issue-assignee-dropdown');
+    });
   });
 });