Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc32

7 files changed, 169 insertions, 165 deletions

diff --git a/spec/frontend/boards/board_blank_state_spec.js b/spec/frontend/boards/board_blank_state_spec.js
deleted file mode 100644
index 3ffdda52f58..00000000000
--- a/spec/frontend/boards/board_blank_state_spec.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import Vue from 'vue';
-import boardsStore from '~/boards/stores/boards_store';
-import BoardBlankState from '~/boards/components/board_blank_state.vue';
-
-describe('Boards blank state', () => {
-  let vm;
-  let fail = false;
-
-  beforeEach(done => {
-    const Comp = Vue.extend(BoardBlankState);
-
-    boardsStore.create();
-
-    jest.spyOn(boardsStore, 'addList').mockImplementation();
-    jest.spyOn(boardsStore, 'removeList').mockImplementation();
-    jest.spyOn(boardsStore, 'generateDefaultLists').mockImplementation(
-      () =>
-        new Promise((resolve, reject) => {
-          if (fail) {
-            reject();
-          } else {
-            resolve({
-              data: [
-                {
-                  id: 1,
-                  title: 'To Do',
-                  label: { id: 1 },
-                },
-                {
-                  id: 2,
-                  title: 'Doing',
-                  label: { id: 2 },
-                },
-              ],
-            });
-          }
-        }),
-    );
-
-    vm = new Comp();
-
-    setImmediate(() => {
-      vm.$mount();
-      done();
-    });
-  });
-
-  it('renders pre-defined labels', () => {
-    expect(vm.$el.querySelectorAll('.board-blank-state-list li').length).toBe(2);
-
-    expect(vm.$el.querySelectorAll('.board-blank-state-list li')[0].textContent.trim()).toEqual(
-      'To Do',
-    );
-
-    expect(vm.$el.querySelectorAll('.board-blank-state-list li')[1].textContent.trim()).toEqual(
-      'Doing',
-    );
-  });
-
-  it('clears blank state', done => {
-    vm.$el.querySelector('.btn-default').click();
-
-    setImmediate(() => {
-      expect(boardsStore.welcomeIsHidden()).toBeTruthy();
-
-      done();
-    });
-  });
-
-  it('creates pre-defined labels', done => {
-    vm.$el.querySelector('.btn-success').click();
-
-    setImmediate(() => {
-      expect(boardsStore.addList).toHaveBeenCalledTimes(2);
-      expect(boardsStore.addList).toHaveBeenCalledWith(expect.objectContaining({ title: 'To Do' }));
-
-      expect(boardsStore.addList).toHaveBeenCalledWith(expect.objectContaining({ title: 'Doing' }));
-
-      done();
-    });
-  });
-
-  it('resets the store if request fails', done => {
-    fail = true;
-
-    vm.$el.querySelector('.btn-success').click();
-
-    setImmediate(() => {
-      expect(boardsStore.welcomeIsHidden()).toBeFalsy();
-      expect(boardsStore.removeList).toHaveBeenCalledWith(undefined, 'label');
-
-      done();
-    });
-  });
-});
diff --git a/spec/frontend/boards/boards_store_spec.js b/spec/frontend/boards/boards_store_spec.js
index 41971137b95..e7c1cf79fdc 100644
--- a/spec/frontend/boards/boards_store_spec.js
+++ b/spec/frontend/boards/boards_store_spec.js
@@ -1,7 +1,7 @@
 import AxiosMockAdapter from 'axios-mock-adapter';
 import { TEST_HOST } from 'helpers/test_constants';
 import axios from '~/lib/utils/axios_utils';
-import boardsStore from '~/boards/stores/boards_store';
+import boardsStore, { gqlClient } from '~/boards/stores/boards_store';
 import eventHub from '~/boards/eventhub';
 import { listObj, listObjDuplicate } from './mock_data';
 
@@ -503,11 +503,15 @@ describe('boardsStore', () => {
       beforeEach(() => {
         requestSpy = jest.fn();
         axiosMock.onPut(url).replyOnce(config => requestSpy(config));
+        jest.spyOn(gqlClient, 'mutate').mockReturnValue(Promise.resolve({}));
       });
 
       it('makes a request to update the board', () => {
         requestSpy.mockReturnValue([200, dummyResponse]);
-        const expectedResponse = expect.objectContaining({ data: dummyResponse });
+        const expectedResponse = [
+          expect.objectContaining({ data: dummyResponse }),
+          expect.objectContaining({}),
+        ];
 
         return expect(
           boardsStore.createBoard({
@@ -555,11 +559,12 @@ describe('boardsStore', () => {
       beforeEach(() => {
         requestSpy = jest.fn();
         axiosMock.onPost(url).replyOnce(config => requestSpy(config));
+        jest.spyOn(gqlClient, 'mutate').mockReturnValue(Promise.resolve({}));
       });
 
       it('makes a request to create a new board', () => {
         requestSpy.mockReturnValue([200, dummyResponse]);
-        const expectedResponse = expect.objectContaining({ data: dummyResponse });
+        const expectedResponse = dummyResponse;
 
         return expect(boardsStore.createBoard(board))
           .resolves.toEqual(expectedResponse)
@@ -740,14 +745,6 @@ describe('boardsStore', () => {
         expect(boardsStore.shouldAddBlankState()).toBe(true);
       });
 
-      it('adds the blank state', () => {
-        boardsStore.addBlankState();
-
-        const list = boardsStore.findList('type', 'blank', 'blank');
-
-        expect(list).toBeDefined();
-      });
-
       it('removes list from state', () => {
         boardsStore.addList(listObj);
 
diff --git a/spec/frontend/boards/components/board_configuration_options_spec.js b/spec/frontend/boards/components/board_configuration_options_spec.js
new file mode 100644
index 00000000000..e9a1cb6a4e8
--- /dev/null
+++ b/spec/frontend/boards/components/board_configuration_options_spec.js
@@ -0,0 +1,59 @@
+import { shallowMount } from '@vue/test-utils';
+import BoardConfigurationOptions from '~/boards/components/board_configuration_options.vue';
+
+describe('BoardConfigurationOptions', () => {
+  let wrapper;
+  const board = { hide_backlog_list: false, hide_closed_list: false };
+
+  const defaultProps = {
+    currentBoard: board,
+    board,
+    isNewForm: false,
+  };
+
+  const createComponent = () => {
+    wrapper = shallowMount(BoardConfigurationOptions, {
+      propsData: { ...defaultProps },
+    });
+  };
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  const backlogListCheckbox = el => el.find('[data-testid="backlog-list-checkbox"]');
+  const closedListCheckbox = el => el.find('[data-testid="closed-list-checkbox"]');
+
+  const checkboxAssert = (backlogCheckbox, closedCheckbox) => {
+    expect(backlogListCheckbox(wrapper).attributes('checked')).toEqual(
+      backlogCheckbox ? undefined : 'true',
+    );
+    expect(closedListCheckbox(wrapper).attributes('checked')).toEqual(
+      closedCheckbox ? undefined : 'true',
+    );
+  };
+
+  it.each`
+    backlogCheckboxValue | closedCheckboxValue
+    ${true}              | ${true}
+    ${true}              | ${false}
+    ${false}             | ${true}
+    ${false}             | ${false}
+  `(
+    'renders two checkbox when one is $backlogCheckboxValue and other is $closedCheckboxValue',
+    async ({ backlogCheckboxValue, closedCheckboxValue }) => {
+      await wrapper.setData({
+        hideBacklogList: backlogCheckboxValue,
+        hideClosedList: closedCheckboxValue,
+      });
+
+      return wrapper.vm.$nextTick().then(() => {
+        checkboxAssert(backlogCheckboxValue, closedCheckboxValue);
+      });
+    },
+  );
+});
diff --git a/spec/frontend/boards/components/board_content_spec.js b/spec/frontend/boards/components/board_content_spec.js
index df117d06cdf..09e38001e2e 100644
--- a/spec/frontend/boards/components/board_content_spec.js
+++ b/spec/frontend/boards/components/board_content_spec.js
@@ -23,9 +23,6 @@ describe('BoardContent', () => {
     return new Vuex.Store({
       getters,
       state,
-      actions: {
-        fetchIssuesForAllLists: () => {},
-      },
     });
   };
 
diff --git a/spec/frontend/boards/components/sidebar/board_editable_item_spec.js b/spec/frontend/boards/components/sidebar/board_editable_item_spec.js
index 1dbcbd06407..e7139ceaa93 100644
--- a/spec/frontend/boards/components/sidebar/board_editable_item_spec.js
+++ b/spec/frontend/boards/components/sidebar/board_editable_item_spec.js
@@ -96,12 +96,22 @@ describe('boards sidebar remove issue', () => {
       expect(findExpanded().isVisible()).toBe(false);
     });
 
-    it('emits changed event', async () => {
+    it('emits close event', async () => {
       document.body.click();
 
       await wrapper.vm.$nextTick();
 
-      expect(wrapper.emitted().changed[1][0]).toBe(false);
+      expect(wrapper.emitted().close.length).toBe(1);
     });
   });
+
+  it('emits open when edit button is clicked and edit is initailized to false', async () => {
+    createComponent({ canUpdate: true });
+
+    findEditButton().vm.$emit('click');
+
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted().open.length).toBe(1);
+  });
 });
diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index bdbcd435708..6415a5a5d3a 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -6,12 +6,13 @@ import {
   mockIssueWithModel,
   mockIssue2WithModel,
   rawIssue,
+  mockIssues,
 } from '../mock_data';
 import actions, { gqlClient } from '~/boards/stores/actions';
 import * as types from '~/boards/stores/mutation_types';
 import { inactiveId, ListType } from '~/boards/constants';
 import issueMoveListMutation from '~/boards/queries/issue_move_list.mutation.graphql';
-import { fullBoardId } from '~/boards/boards_util';
+import { fullBoardId, formatListIssues } from '~/boards/boards_util';
 
 const expectNotImplemented = action => {
   it('is not implemented', () => {
@@ -237,6 +238,77 @@ describe('deleteList', () => {
   expectNotImplemented(actions.deleteList);
 });
 
+describe('fetchIssuesForList', () => {
+  const listId = mockLists[0].id;
+
+  const state = {
+    endpoints: {
+      fullPath: 'gitlab-org',
+      boardId: 1,
+    },
+    filterParams: {},
+    boardType: 'group',
+  };
+
+  const queryResponse = {
+    data: {
+      group: {
+        board: {
+          lists: {
+            nodes: [
+              {
+                id: listId,
+                issues: {
+                  nodes: mockIssues,
+                },
+              },
+            ],
+          },
+        },
+      },
+    },
+  };
+
+  const formattedIssues = formatListIssues(queryResponse.data.group.board.lists);
+
+  it('should commit mutation RECEIVE_ISSUES_FOR_LIST_SUCCESS on success', done => {
+    jest.spyOn(gqlClient, 'query').mockResolvedValue(queryResponse);
+
+    testAction(
+      actions.fetchIssuesForList,
+      listId,
+      state,
+      [
+        {
+          type: types.RECEIVE_ISSUES_FOR_LIST_SUCCESS,
+          payload: { listIssues: formattedIssues, listId },
+        },
+      ],
+      [],
+      done,
+    );
+  });
+
+  it('should commit mutation RECEIVE_ISSUES_FOR_LIST_FAILURE on failure', done => {
+    jest.spyOn(gqlClient, 'query').mockResolvedValue(Promise.reject());
+
+    testAction(
+      actions.fetchIssuesForList,
+      listId,
+      state,
+      [{ type: types.RECEIVE_ISSUES_FOR_LIST_FAILURE, payload: listId }],
+      [],
+      done,
+    );
+  });
+});
+
+describe('resetIssues', () => {
+  it('commits RESET_ISSUES mutation', () => {
+    return testAction(actions.resetIssues, {}, {}, [{ type: types.RESET_ISSUES }], []);
+  });
+});
+
 describe('moveIssue', () => {
   const listIssues = {
     'gid://gitlab/List/1': [436, 437],
diff --git a/spec/frontend/boards/stores/mutations_spec.js b/spec/frontend/boards/stores/mutations_spec.js
index a13a99a507e..c80537bf168 100644
--- a/spec/frontend/boards/stores/mutations_spec.js
+++ b/spec/frontend/boards/stores/mutations_spec.js
@@ -145,6 +145,23 @@ describe('Board Store Mutations', () => {
     expectNotImplemented(mutations.RECEIVE_REMOVE_LIST_ERROR);
   });
 
+  describe('RESET_ISSUES', () => {
+    it('should remove issues from issuesByListId state', () => {
+      const issuesByListId = {
+        'gid://gitlab/List/1': [mockIssue.id],
+      };
+
+      state = {
+        ...state,
+        issuesByListId,
+      };
+
+      mutations[types.RESET_ISSUES](state);
+
+      expect(state.issuesByListId).toEqual({ 'gid://gitlab/List/1': [] });
+    });
+  });
+
   describe('RECEIVE_ISSUES_FOR_LIST_SUCCESS', () => {
     it('updates issuesByListId and issues on state', () => {
       const listIssues = {
@@ -156,7 +173,6 @@ describe('Board Store Mutations', () => {
 
       state = {
         ...state,
-        isLoadingIssues: true,
         issuesByListId: {},
         issues: {},
         boardLists: mockListsWithModel,
@@ -172,16 +188,6 @@ describe('Board Store Mutations', () => {
     });
   });
 
-  describe('REQUEST_ISSUES_FOR_ALL_LISTS', () => {
-    it('sets isLoadingIssues to true', () => {
-      expect(state.isLoadingIssues).toBe(false);
-
-      mutations.REQUEST_ISSUES_FOR_ALL_LISTS(state);
-
-      expect(state.isLoadingIssues).toBe(true);
-    });
-  });
-
   describe('RECEIVE_ISSUES_FOR_LIST_FAILURE', () => {
     it('sets error message', () => {
       state = {
@@ -200,51 +206,10 @@ describe('Board Store Mutations', () => {
     });
   });
 
-  describe('RECEIVE_ISSUES_FOR_ALL_LISTS_SUCCESS', () => {
-    it('sets isLoadingIssues to false and updates issuesByListId object', () => {
-      const listIssues = {
-        'gid://gitlab/List/1': [mockIssue.id],
-      };
-      const issues = {
-        '1': mockIssue,
-      };
-
-      state = {
-        ...state,
-        isLoadingIssues: true,
-        issuesByListId: {},
-        issues: {},
-      };
-
-      mutations.RECEIVE_ISSUES_FOR_ALL_LISTS_SUCCESS(state, { listData: listIssues, issues });
-
-      expect(state.isLoadingIssues).toBe(false);
-      expect(state.issuesByListId).toEqual(listIssues);
-      expect(state.issues).toEqual(issues);
-    });
-  });
-
   describe('REQUEST_ADD_ISSUE', () => {
     expectNotImplemented(mutations.REQUEST_ADD_ISSUE);
   });
 
-  describe('RECEIVE_ISSUES_FOR_ALL_LISTS_FAILURE', () => {
-    it('sets isLoadingIssues to false and sets error message', () => {
-      state = {
-        ...state,
-        isLoadingIssues: true,
-        error: undefined,
-      };
-
-      mutations.RECEIVE_ISSUES_FOR_ALL_LISTS_FAILURE(state);
-
-      expect(state.isLoadingIssues).toBe(false);
-      expect(state.error).toEqual(
-        'An error occurred while fetching the board issues. Please reload the page.',
-      );
-    });
-  });
-
   describe('UPDATE_ISSUE_BY_ID', () => {
     const issueId = '1';
     const prop = 'id';
@@ -254,7 +219,6 @@ describe('Board Store Mutations', () => {
     beforeEach(() => {
       state = {
         ...state,
-        isLoadingIssues: true,
         error: undefined,
         issues: {
           ...issue,