Add latest changes from gitlab-org/gitlab@master

7 files changed, 26 insertions, 196 deletions

diff --git a/spec/frontend/boards/components/board_content_sidebar_spec.js b/spec/frontend/boards/components/board_content_sidebar_spec.js
index e97bdba5fea..10d739c65f5 100644
--- a/spec/frontend/boards/components/board_content_sidebar_spec.js
+++ b/spec/frontend/boards/components/board_content_sidebar_spec.js
@@ -4,10 +4,10 @@ import Vuex from 'vuex';
 import SidebarDropdownWidget from 'ee_else_ce/sidebar/components/sidebar_dropdown_widget.vue';
 import { stubComponent } from 'helpers/stub_component';
 import BoardContentSidebar from '~/boards/components/board_content_sidebar.vue';
-import BoardSidebarDueDate from '~/boards/components/sidebar/board_sidebar_due_date.vue';
 import BoardSidebarLabelsSelect from '~/boards/components/sidebar/board_sidebar_labels_select.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 SidebarSubscriptionsWidget from '~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue';
 import { mockIssue, mockIssueGroupPath, mockIssueProjectPath } from '../mock_data';
 
@@ -109,8 +109,8 @@ describe('BoardContentSidebar', () => {
     expect(wrapper.findComponent(BoardSidebarTitle).exists()).toBe(true);
   });
 
-  it('renders BoardSidebarDueDate', () => {
-    expect(wrapper.findComponent(BoardSidebarDueDate).exists()).toBe(true);
+  it('renders SidebarDateWidget', () => {
+    expect(wrapper.findComponent(SidebarDateWidget).exists()).toBe(true);
   });
 
   it('renders BoardSidebarSubscription', () => {
diff --git a/spec/frontend/boards/components/sidebar/board_sidebar_due_date_spec.js b/spec/frontend/boards/components/sidebar/board_sidebar_due_date_spec.js
deleted file mode 100644
index 2f91beda275..00000000000
--- a/spec/frontend/boards/components/sidebar/board_sidebar_due_date_spec.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import { GlDatepicker } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
-import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
-import BoardSidebarDueDate from '~/boards/components/sidebar/board_sidebar_due_date.vue';
-import { createStore } from '~/boards/stores';
-
-const TEST_DUE_DATE = '2020-02-20';
-const TEST_FORMATTED_DUE_DATE = 'Feb 20, 2020';
-const TEST_PARSED_DATE = new Date(2020, 1, 20);
-const TEST_ISSUE = { id: 'gid://gitlab/Issue/1', iid: 9, dueDate: null, referencePath: 'h/b#2' };
-
-describe('~/boards/components/sidebar/board_sidebar_due_date.vue', () => {
-  let wrapper;
-  let store;
-
-  afterEach(() => {
-    wrapper.destroy();
-    store = null;
-    wrapper = null;
-  });
-
-  const createWrapper = ({ dueDate = null } = {}) => {
-    store = createStore();
-    store.state.boardItems = { [TEST_ISSUE.id]: { ...TEST_ISSUE, dueDate } };
-    store.state.activeId = TEST_ISSUE.id;
-
-    wrapper = shallowMount(BoardSidebarDueDate, {
-      store,
-      provide: {
-        canUpdate: true,
-      },
-      stubs: {
-        'board-editable-item': BoardEditableItem,
-      },
-    });
-  };
-
-  const findDatePicker = () => wrapper.find(GlDatepicker);
-  const findResetButton = () => wrapper.find('[data-testid="reset-button"]');
-  const findCollapsed = () => wrapper.find('[data-testid="collapsed-content"]');
-
-  it('renders "None" when no due date is set', () => {
-    createWrapper();
-
-    expect(findCollapsed().text()).toBe('None');
-    expect(findResetButton().exists()).toBe(false);
-  });
-
-  it('renders formatted due date with reset button when set', () => {
-    createWrapper({ dueDate: TEST_DUE_DATE });
-
-    expect(findCollapsed().text()).toContain(TEST_FORMATTED_DUE_DATE);
-    expect(findResetButton().exists()).toBe(true);
-  });
-
-  describe('when due date is submitted', () => {
-    beforeEach(async () => {
-      createWrapper();
-
-      jest.spyOn(wrapper.vm, 'setActiveIssueDueDate').mockImplementation(() => {
-        store.state.boardItems[TEST_ISSUE.id].dueDate = TEST_DUE_DATE;
-      });
-      findDatePicker().vm.$emit('input', TEST_PARSED_DATE);
-      await wrapper.vm.$nextTick();
-    });
-
-    it('collapses sidebar and renders formatted due date with reset button', () => {
-      expect(findCollapsed().isVisible()).toBe(true);
-      expect(findCollapsed().text()).toContain(TEST_FORMATTED_DUE_DATE);
-      expect(findResetButton().exists()).toBe(true);
-    });
-
-    it('commits change to the server', () => {
-      expect(wrapper.vm.setActiveIssueDueDate).toHaveBeenCalledWith({
-        dueDate: TEST_DUE_DATE,
-        projectPath: 'h/b',
-      });
-    });
-  });
-
-  describe('when due date is cleared', () => {
-    beforeEach(async () => {
-      createWrapper();
-
-      jest.spyOn(wrapper.vm, 'setActiveIssueDueDate').mockImplementation(() => {
-        store.state.boardItems[TEST_ISSUE.id].dueDate = null;
-      });
-      findDatePicker().vm.$emit('clear');
-      await wrapper.vm.$nextTick();
-    });
-
-    it('collapses sidebar and renders "None"', () => {
-      expect(wrapper.vm.setActiveIssueDueDate).toHaveBeenCalled();
-      expect(findCollapsed().isVisible()).toBe(true);
-      expect(findCollapsed().text()).toBe('None');
-    });
-  });
-
-  describe('when due date is resetted', () => {
-    beforeEach(async () => {
-      createWrapper({ dueDate: TEST_DUE_DATE });
-
-      jest.spyOn(wrapper.vm, 'setActiveIssueDueDate').mockImplementation(() => {
-        store.state.boardItems[TEST_ISSUE.id].dueDate = null;
-      });
-      findResetButton().vm.$emit('click');
-      await wrapper.vm.$nextTick();
-    });
-
-    it('collapses sidebar and renders "None"', () => {
-      expect(wrapper.vm.setActiveIssueDueDate).toHaveBeenCalled();
-      expect(findCollapsed().isVisible()).toBe(true);
-      expect(findCollapsed().text()).toBe('None');
-    });
-  });
-
-  describe('when the mutation fails', () => {
-    beforeEach(async () => {
-      createWrapper({ dueDate: TEST_DUE_DATE });
-
-      jest.spyOn(wrapper.vm, 'setActiveIssueDueDate').mockImplementation(() => {
-        throw new Error(['failed mutation']);
-      });
-      jest.spyOn(wrapper.vm, 'setError').mockImplementation(() => {});
-      findDatePicker().vm.$emit('input', 'Invalid date');
-      await wrapper.vm.$nextTick();
-    });
-
-    it('collapses sidebar and renders former issue due date', () => {
-      expect(findCollapsed().isVisible()).toBe(true);
-      expect(findCollapsed().text()).toContain(TEST_FORMATTED_DUE_DATE);
-      expect(wrapper.vm.setError).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index 63569333408..b28412f2127 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -1386,57 +1386,6 @@ describe('setActiveIssueLabels', () => {
   });
 });
 
-describe('setActiveIssueDueDate', () => {
-  const state = { boardItems: { [mockIssue.id]: mockIssue } };
-  const getters = { activeBoardItem: mockIssue };
-  const testDueDate = '2020-02-20';
-  const input = {
-    dueDate: testDueDate,
-    projectPath: 'h/b',
-  };
-
-  it('should commit due date after setting the issue', (done) => {
-    jest.spyOn(gqlClient, 'mutate').mockResolvedValue({
-      data: {
-        updateIssue: {
-          issue: {
-            dueDate: testDueDate,
-          },
-          errors: [],
-        },
-      },
-    });
-
-    const payload = {
-      itemId: getters.activeBoardItem.id,
-      prop: 'dueDate',
-      value: testDueDate,
-    };
-
-    testAction(
-      actions.setActiveIssueDueDate,
-      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.setActiveIssueDueDate({ getters }, input)).rejects.toThrow(Error);
-  });
-});
-
 describe('setActiveItemSubscribed', () => {
   const state = {
     boardItems: {
diff --git a/spec/frontend/nav/components/responsive_app_spec.js b/spec/frontend/nav/components/responsive_app_spec.js
index 4d7f053e43b..7221ea2c5cd 100644
--- a/spec/frontend/nav/components/responsive_app_spec.js
+++ b/spec/frontend/nav/components/responsive_app_spec.js
@@ -8,6 +8,11 @@ import { resetMenuItemsActive } from '~/nav/utils/reset_menu_items_active';
 import KeepAliveSlots from '~/vue_shared/components/keep_alive_slots.vue';
 import { TEST_NAV_DATA } from '../mock_data';
 
+const HTML_HEADER_CONTENT = '<div class="header-content"></div>';
+const HTML_MENU_EXPANDED = '<div class="menu-expanded"></div>';
+const HTML_HEADER_WITH_MENU_EXPANDED =
+  '<div></div><div class="header-content menu-expanded"></div>';
+
 describe('~/nav/components/responsive_app.vue', () => {
   let wrapper;
 
@@ -53,11 +58,11 @@ describe('~/nav/components/responsive_app.vue', () => {
     });
 
     it.each`
-      bodyHtml                                                          | expectation
-      ${''}                                                             | ${false}
-      ${'<div class="header-content"></div>'}                           | ${false}
-      ${'<div class="menu-expanded"></div>'}                            | ${false}
-      ${'<div></div><div class="header-content menu-expanded"></div>}'} | ${true}
+      bodyHtml                          | expectation
+      ${''}                             | ${false}
+      ${HTML_HEADER_CONTENT}            | ${false}
+      ${HTML_MENU_EXPANDED}             | ${false}
+      ${HTML_HEADER_WITH_MENU_EXPANDED} | ${true}
     `(
       'with responsive toggle event and html set to $bodyHtml, responsive open = $expectation',
       ({ bodyHtml, expectation }) => {
@@ -93,7 +98,7 @@ describe('~/nav/components/responsive_app.vue', () => {
 
   describe('with menu expanded in body', () => {
     beforeEach(() => {
-      document.body.innerHTML = '<div></div><div class="header-content menu-expanded"></div>';
+      document.body.innerHTML = HTML_HEADER_WITH_MENU_EXPANDED;
       createComponent();
     });
 
diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js
index 254e2fc07b4..da28c9873d9 100644
--- a/spec/frontend/repository/components/table/row_spec.js
+++ b/spec/frontend/repository/components/table/row_spec.js
@@ -19,6 +19,7 @@ function factory(propsData = {}) {
       name: propsData.path,
       projectPath: 'gitlab-org/gitlab-ce',
       url: `https://test.com`,
+      totalEntries: 10,
     },
     directives: {
       GlHoverLoad: createMockDirective(),
diff --git a/spec/frontend/repository/log_tree_spec.js b/spec/frontend/repository/log_tree_spec.js
index a842053caad..d338af88ce3 100644
--- a/spec/frontend/repository/log_tree_spec.js
+++ b/spec/frontend/repository/log_tree_spec.js
@@ -69,6 +69,11 @@ describe('fetchLogsTree', () => {
     mock.restore();
   });
 
+  it('does not call axios get if offset is larger than the maximum offset', () =>
+    fetchLogsTree(client, '', '1000', resolver, 900).then(() => {
+      expect(axios.get).not.toHaveBeenCalled();
+    }));
+
   it('calls axios get', () =>
     fetchLogsTree(client, '', '0', resolver).then(() => {
       expect(axios.get).toHaveBeenCalledWith('/gitlab-org/gitlab-foss/-/refs/main/logs_tree/', {
diff --git a/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js b/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
index 91cbcc6cc27..619e89beb23 100644
--- a/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
+++ b/spec/frontend/sidebar/components/date/sidebar_date_widget_spec.js
@@ -22,6 +22,10 @@ describe('Sidebar date Widget', () => {
   let fakeApollo;
   const date = '2021-04-15';
 
+  window.gon = {
+    first_day_of_week: 1,
+  };
+
   const findEditableItem = () => wrapper.findComponent(SidebarEditableItem);
   const findPopoverIcon = () => wrapper.find('[data-testid="inherit-date-popover"]');
   const findDatePicker = () => wrapper.find(GlDatepicker);
@@ -119,11 +123,12 @@ describe('Sidebar date Widget', () => {
       expect(wrapper.emitted('dueDateUpdated')).toEqual([[date]]);
     });
 
-    it('uses a correct prop to set the initial date for GlDatePicker', () => {
+    it('uses a correct prop to set the initial date and first day of the week for GlDatePicker', () => {
       expect(findDatePicker().props()).toMatchObject({
         value: null,
         autocomplete: 'off',
         defaultDate: expect.any(Object),
+        firstDay: window.gon.first_day_of_week,
       });
     });