Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

5 files changed, 58 insertions, 8 deletions

diff --git a/spec/frontend/boards/components/board_card_spec.js b/spec/frontend/boards/components/board_card_spec.js
index 5742dfdc5d2..3af173aa18c 100644
--- a/spec/frontend/boards/components/board_card_spec.js
+++ b/spec/frontend/boards/components/board_card_spec.js
@@ -167,7 +167,7 @@ describe('Board card', () => {
       mountComponent({ item: { ...mockIssue, isLoading: true } });
 
       expect(wrapper.classes()).toContain('is-disabled');
-      expect(wrapper.classes()).not.toContain('user-can-drag');
+      expect(wrapper.classes()).not.toContain('gl-cursor-grab');
     });
   });
 
@@ -177,7 +177,7 @@ describe('Board card', () => {
       mountComponent();
 
       expect(wrapper.classes()).not.toContain('is-disabled');
-      expect(wrapper.classes()).toContain('user-can-drag');
+      expect(wrapper.classes()).toContain('gl-cursor-grab');
     });
   });
 });
diff --git a/spec/frontend/boards/components/board_content_sidebar_spec.js b/spec/frontend/boards/components/board_content_sidebar_spec.js
index 7b176cea2a3..368c7d561f8 100644
--- a/spec/frontend/boards/components/board_content_sidebar_spec.js
+++ b/spec/frontend/boards/components/board_content_sidebar_spec.js
@@ -9,6 +9,7 @@ import BoardContentSidebar from '~/boards/components/board_content_sidebar.vue';
 import BoardSidebarTitle from '~/boards/components/sidebar/board_sidebar_title.vue';
 import { ISSUABLE } from '~/boards/constants';
 import SidebarDateWidget from '~/sidebar/components/date/sidebar_date_widget.vue';
+import SidebarSeverity from '~/sidebar/components/severity/sidebar_severity.vue';
 import SidebarSubscriptionsWidget from '~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue';
 import SidebarTodoWidget from '~/sidebar/components/todo_toggle/sidebar_todo_widget.vue';
 import SidebarLabelsWidget from '~/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue';
@@ -96,7 +97,7 @@ describe('BoardContentSidebar', () => {
   });
 
   it('confirms we render MountingPortal', () => {
-    expect(wrapper.find(MountingPortal).props()).toMatchObject({
+    expect(wrapper.findComponent(MountingPortal).props()).toMatchObject({
       mountTo: '#js-right-sidebar-portal',
       append: true,
       name: 'board-content-sidebar',
@@ -141,6 +142,10 @@ describe('BoardContentSidebar', () => {
     );
   });
 
+  it('does not render SidebarSeverity', () => {
+    expect(wrapper.findComponent(SidebarSeverity).exists()).toBe(false);
+  });
+
   describe('when we emit close', () => {
     let toggleBoardItem;
 
@@ -160,4 +165,17 @@ describe('BoardContentSidebar', () => {
       });
     });
   });
+
+  describe('incident sidebar', () => {
+    beforeEach(() => {
+      createStore({
+        mockGetters: { activeBoardItem: () => ({ ...mockIssue, epic: null, type: 'INCIDENT' }) },
+      });
+      createComponent();
+    });
+
+    it('renders SidebarSeverity', () => {
+      expect(wrapper.findComponent(SidebarSeverity).exists()).toBe(true);
+    });
+  });
 });
diff --git a/spec/frontend/boards/components/board_filtered_search_spec.js b/spec/frontend/boards/components/board_filtered_search_spec.js
index ea551e94f2f..a8398a138ba 100644
--- a/spec/frontend/boards/components/board_filtered_search_spec.js
+++ b/spec/frontend/boards/components/board_filtered_search_spec.js
@@ -118,6 +118,7 @@ describe('BoardFilteredSearch', () => {
     it('sets the url params to the correct results', async () => {
       const mockFilters = [
         { type: 'author', value: { data: 'root', operator: '=' } },
+        { type: 'assignee', value: { data: 'root', operator: '=' } },
         { type: 'label', value: { data: 'label', operator: '=' } },
         { type: 'label', value: { data: 'label2', operator: '=' } },
         { type: 'milestone', value: { data: 'New Milestone', operator: '=' } },
@@ -133,7 +134,26 @@ describe('BoardFilteredSearch', () => {
         title: '',
         replace: true,
         url:
-          'http://test.host/?author_username=root&label_name[]=label&label_name[]=label2&milestone_title=New+Milestone&iteration_id=3341&types=INCIDENT&weight=2&release_tag=v1.0.0',
+          'http://test.host/?author_username=root&label_name[]=label&label_name[]=label2&assignee_username=root&milestone_title=New+Milestone&iteration_id=3341&types=INCIDENT&weight=2&release_tag=v1.0.0',
+      });
+    });
+
+    describe('when assignee is passed a wildcard value', () => {
+      const url = (arg) => `http://test.host/?assignee_id=${arg}`;
+
+      it.each([
+        ['None', url('None')],
+        ['Any', url('Any')],
+      ])('sets the url param %s', (assigneeParam, expected) => {
+        const mockFilters = [{ type: 'assignee', value: { data: assigneeParam, operator: '=' } }];
+        jest.spyOn(urlUtility, 'updateHistory');
+        findFilteredSearch().vm.$emit('onFilter', mockFilters);
+
+        expect(urlUtility.updateHistory).toHaveBeenCalledWith({
+          title: '',
+          replace: true,
+          url: expected,
+        });
       });
     });
   });
diff --git a/spec/frontend/boards/components/board_list_header_spec.js b/spec/frontend/boards/components/board_list_header_spec.js
index 148d0c5684d..8cc0ad5f30c 100644
--- a/spec/frontend/boards/components/board_list_header_spec.js
+++ b/spec/frontend/boards/components/board_list_header_spec.js
@@ -180,18 +180,18 @@ describe('Board List Header Component', () => {
     const canDragList = [ListType.label, ListType.milestone, ListType.iteration, ListType.assignee];
 
     it.each(cannotDragList)(
-      'does not have user-can-drag-class so user cannot drag list',
+      'does not have gl-cursor-grab class so user cannot drag list',
       (listType) => {
         createComponent({ listType });
 
-        expect(findTitle().classes()).not.toContain('user-can-drag');
+        expect(findTitle().classes()).not.toContain('gl-cursor-grab');
       },
     );
 
-    it.each(canDragList)('has user-can-drag-class so user can drag list', (listType) => {
+    it.each(canDragList)('has gl-cursor-grab class so user can drag list', (listType) => {
       createComponent({ listType });
 
-      expect(findTitle().classes()).toContain('user-can-drag');
+      expect(findTitle().classes()).toContain('gl-cursor-grab');
     });
   });
 });
diff --git a/spec/frontend/boards/components/boards_selector_spec.js b/spec/frontend/boards/components/boards_selector_spec.js
index c841c17a029..9cf7c5774bf 100644
--- a/spec/frontend/boards/components/boards_selector_spec.js
+++ b/spec/frontend/boards/components/boards_selector_spec.js
@@ -96,6 +96,8 @@ describe('BoardsSelector', () => {
     });
 
     wrapper.vm.$apollo.addSmartQuery = jest.fn((_, options) => {
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({
         [options.loadingKey]: true,
       });
@@ -161,6 +163,8 @@ describe('BoardsSelector', () => {
         // Emits gl-dropdown show event to simulate the dropdown is opened at initialization time
         findDropdown().vm.$emit('show');
 
+        // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+        // eslint-disable-next-line no-restricted-syntax
         await wrapper.setData({
           loadingBoards: false,
           loadingRecentBoards: false,
@@ -176,6 +180,8 @@ describe('BoardsSelector', () => {
 
       describe('filtering', () => {
         beforeEach(async () => {
+          // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+          // eslint-disable-next-line no-restricted-syntax
           wrapper.setData({
             boards,
           });
@@ -208,6 +214,8 @@ describe('BoardsSelector', () => {
 
       describe('recent boards section', () => {
         it('shows only when boards are greater than 10', async () => {
+          // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+          // eslint-disable-next-line no-restricted-syntax
           wrapper.setData({
             boards,
           });
@@ -217,6 +225,8 @@ describe('BoardsSelector', () => {
         });
 
         it('does not show when boards are less than 10', async () => {
+          // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+          // eslint-disable-next-line no-restricted-syntax
           wrapper.setData({
             boards: boards.slice(0, 5),
           });
@@ -226,6 +236,8 @@ describe('BoardsSelector', () => {
         });
 
         it('does not show when recentBoards api returns empty array', async () => {
+          // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+          // eslint-disable-next-line no-restricted-syntax
           wrapper.setData({
             recentBoards: [],
           });