Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

6 files changed, 27 insertions, 84 deletions

diff --git a/spec/frontend/diffs/components/app_spec.js b/spec/frontend/diffs/components/app_spec.js
index 1464dd84666..9dc82bbdc93 100644
--- a/spec/frontend/diffs/components/app_spec.js
+++ b/spec/frontend/diffs/components/app_spec.js
@@ -183,7 +183,7 @@ describe('diffs/components/app', () => {
 
   it('displays loading icon on batch loading', () => {
     createComponent({}, ({ state }) => {
-      state.diffs.isBatchLoading = true;
+      state.diffs.batchLoadingState = 'loading';
     });
 
     expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
@@ -705,24 +705,4 @@ describe('diffs/components/app', () => {
       );
     });
   });
-
-  describe('diff file tree is aware of review bar', () => {
-    it('it does not have review-bar-visible class when review bar is not visible', () => {
-      createComponent({}, ({ state }) => {
-        state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }];
-      });
-
-      expect(wrapper.find('.js-diff-tree-list').exists()).toBe(true);
-      expect(wrapper.find('.js-diff-tree-list.review-bar-visible').exists()).toBe(false);
-    });
-
-    it('it does have review-bar-visible class when review bar is visible', () => {
-      createComponent({}, ({ state }) => {
-        state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }];
-        state.batchComments.drafts = ['draft message'];
-      });
-
-      expect(wrapper.find('.js-diff-tree-list.review-bar-visible').exists()).toBe(true);
-    });
-  });
 });
diff --git a/spec/frontend/diffs/components/diff_file_spec.js b/spec/frontend/diffs/components/diff_file_spec.js
index 3dec56f2fe3..feb7118744b 100644
--- a/spec/frontend/diffs/components/diff_file_spec.js
+++ b/spec/frontend/diffs/components/diff_file_spec.js
@@ -242,32 +242,20 @@ describe('DiffFile', () => {
       });
 
       it.each`
-        loggedIn | featureOn | bool
-        ${true}  | ${true}   | ${true}
-        ${false} | ${true}   | ${false}
-        ${true}  | ${false}  | ${false}
-        ${false} | ${false}  | ${false}
-      `(
-        'should be $bool when { userIsLoggedIn: $loggedIn, featureEnabled: $featureOn }',
-        ({ loggedIn, featureOn, bool }) => {
-          setLoggedIn(loggedIn);
-
-          ({ wrapper } = createComponent({
-            options: {
-              provide: {
-                glFeatures: {
-                  localFileReviews: featureOn,
-                },
-              },
-            },
-            props: {
-              file: store.state.diffs.diffFiles[0],
-            },
-          }));
+        loggedIn | bool
+        ${true}  | ${true}
+        ${false} | ${false}
+      `('should be $bool when { userIsLoggedIn: $loggedIn }', ({ loggedIn, bool }) => {
+        setLoggedIn(loggedIn);
+
+        ({ wrapper } = createComponent({
+          props: {
+            file: store.state.diffs.diffFiles[0],
+          },
+        }));
 
-          expect(wrapper.vm.showLocalFileReviews).toBe(bool);
-        },
-      );
+        expect(wrapper.vm.showLocalFileReviews).toBe(bool);
+      });
     });
   });
 
diff --git a/spec/frontend/diffs/create_diffs_store.js b/spec/frontend/diffs/create_diffs_store.js
index e6a8b7a72ae..307ebdaa4ac 100644
--- a/spec/frontend/diffs/create_diffs_store.js
+++ b/spec/frontend/diffs/create_diffs_store.js
@@ -9,6 +9,12 @@ Vue.use(Vuex);
 export default function createDiffsStore() {
   return new Vuex.Store({
     modules: {
+      page: {
+        namespaced: true,
+        state: {
+          activeTab: 'notes',
+        },
+      },
       diffs: diffsModule(),
       notes: notesModule(),
       batchComments: batchCommentsModule(),
diff --git a/spec/frontend/diffs/store/actions_spec.js b/spec/frontend/diffs/store/actions_spec.js
index 6d005b868a9..b35abc9da02 100644
--- a/spec/frontend/diffs/store/actions_spec.js
+++ b/spec/frontend/diffs/store/actions_spec.js
@@ -186,15 +186,16 @@ describe('DiffsStoreActions', () => {
         {},
         { endpointBatch, diffViewType: 'inline' },
         [
-          { type: types.SET_BATCH_LOADING, payload: true },
+          { type: types.SET_BATCH_LOADING_STATE, payload: 'loading' },
           { type: types.SET_RETRIEVING_BATCHES, payload: true },
           { type: types.SET_DIFF_DATA_BATCH, payload: { diff_files: res1.diff_files } },
-          { type: types.SET_BATCH_LOADING, payload: false },
+          { type: types.SET_BATCH_LOADING_STATE, payload: 'loaded' },
           { type: types.VIEW_DIFF_FILE, payload: 'test' },
           { type: types.SET_DIFF_DATA_BATCH, payload: { diff_files: res2.diff_files } },
-          { type: types.SET_BATCH_LOADING, payload: false },
+          { type: types.SET_BATCH_LOADING_STATE, payload: 'loaded' },
           { type: types.VIEW_DIFF_FILE, payload: 'test2' },
           { type: types.SET_RETRIEVING_BATCHES, payload: false },
+          { type: types.SET_BATCH_LOADING_STATE, payload: 'error' },
         ],
         [{ type: 'startRenderDiffsQueue' }, { type: 'startRenderDiffsQueue' }],
         done,
diff --git a/spec/frontend/diffs/store/mutations_spec.js b/spec/frontend/diffs/store/mutations_spec.js
index b549ca42634..fc9ba223d5a 100644
--- a/spec/frontend/diffs/store/mutations_spec.js
+++ b/spec/frontend/diffs/store/mutations_spec.js
@@ -31,13 +31,13 @@ describe('DiffsStoreMutations', () => {
     });
   });
 
-  describe('SET_BATCH_LOADING', () => {
+  describe('SET_BATCH_LOADING_STATE', () => {
     it('should set loading state', () => {
       const state = {};
 
-      mutations[types.SET_BATCH_LOADING](state, false);
+      mutations[types.SET_BATCH_LOADING_STATE](state, false);
 
-      expect(state.isBatchLoading).toEqual(false);
+      expect(state.batchLoadingState).toEqual(false);
     });
   });
 
diff --git a/spec/frontend/diffs/utils/preferences_spec.js b/spec/frontend/diffs/utils/preferences_spec.js
deleted file mode 100644
index 2dcc71dc188..00000000000
--- a/spec/frontend/diffs/utils/preferences_spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Cookies from 'js-cookie';
-import {
-  DIFF_FILE_BY_FILE_COOKIE_NAME,
-  DIFF_VIEW_FILE_BY_FILE,
-  DIFF_VIEW_ALL_FILES,
-} from '~/diffs/constants';
-import { fileByFile } from '~/diffs/utils/preferences';
-
-describe('diffs preferences', () => {
-  describe('fileByFile', () => {
-    afterEach(() => {
-      Cookies.remove(DIFF_FILE_BY_FILE_COOKIE_NAME);
-    });
-
-    it.each`
-      result   | preference | cookie
-      ${true}  | ${false}   | ${DIFF_VIEW_FILE_BY_FILE}
-      ${false} | ${true}    | ${DIFF_VIEW_ALL_FILES}
-      ${true}  | ${false}   | ${DIFF_VIEW_FILE_BY_FILE}
-      ${false} | ${true}    | ${DIFF_VIEW_ALL_FILES}
-      ${false} | ${false}   | ${DIFF_VIEW_ALL_FILES}
-      ${true}  | ${true}    | ${DIFF_VIEW_FILE_BY_FILE}
-    `(
-      'should return $result when { preference: $preference, cookie: $cookie }',
-      ({ result, preference, cookie }) => {
-        Cookies.set(DIFF_FILE_BY_FILE_COOKIE_NAME, cookie);
-
-        expect(fileByFile(preference)).toBe(result);
-      },
-    );
-  });
-});