Add latest changes from gitlab-org/gitlab@master

3 files changed, 55 insertions, 29 deletions

diff --git a/spec/frontend/diffs/components/app_spec.js b/spec/frontend/diffs/components/app_spec.js
index 3048a40809e..3d8cbaa6b89 100644
--- a/spec/frontend/diffs/components/app_spec.js
+++ b/spec/frontend/diffs/components/app_spec.js
@@ -259,7 +259,7 @@ describe('diffs/components/app', () => {
 
     it('sets width of tree list', () => {
       createComponent({}, ({ state }) => {
-        state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }];
+        state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
       });
 
       expect(wrapper.find('.js-diff-tree-list').element.style.width).toEqual('320px');
@@ -288,7 +288,8 @@ describe('diffs/components/app', () => {
 
     it('does not render empty state when diff files exist', () => {
       createComponent({}, ({ state }) => {
-        state.diffs.diffFiles.push({ id: 1 });
+        state.diffs.diffFiles = ['anything'];
+        state.diffs.treeEntries['1'] = { type: 'blob', id: 1 };
       });
 
       expect(wrapper.findComponent(NoChanges).exists()).toBe(false);
@@ -382,10 +383,10 @@ describe('diffs/components/app', () => {
 
     beforeEach(() => {
       createComponent({}, () => {
-        store.state.diffs.diffFiles = [
-          { file_hash: '111', file_path: '111.js' },
-          { file_hash: '222', file_path: '222.js' },
-          { file_hash: '333', file_path: '333.js' },
+        store.state.diffs.treeEntries = [
+          { type: 'blob', fileHash: '111', path: '111.js' },
+          { type: 'blob', fileHash: '222', path: '222.js' },
+          { type: 'blob', fileHash: '333', path: '333.js' },
         ];
       });
       spy = jest.spyOn(store, 'dispatch');
@@ -501,7 +502,6 @@ describe('diffs/components/app', () => {
   describe('diffs', () => {
     it('should render compare versions component', () => {
       createComponent({}, ({ state }) => {
-        state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }];
         state.diffs.mergeRequestDiffs = diffsMockData;
         state.diffs.targetBranchName = 'target-branch';
         state.diffs.mergeRequestDiff = mergeRequestDiff;
@@ -572,7 +572,12 @@ describe('diffs/components/app', () => {
 
     it('should display diff file if there are diff files', () => {
       createComponent({}, ({ state }) => {
-        state.diffs.diffFiles.push({ sha: '123' });
+        state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }];
+        state.diffs.treeEntries = {
+          111: { type: 'blob', fileHash: '111', path: '111.js' },
+          123: { type: 'blob', fileHash: '123', path: '123.js' },
+          312: { type: 'blob', fileHash: '312', path: '312.js' },
+        };
       });
 
       expect(wrapper.findComponent({ name: 'DynamicScroller' }).exists()).toBe(true);
@@ -589,7 +594,7 @@ describe('diffs/components/app', () => {
 
     it('should render tree list', () => {
       createComponent({}, ({ state }) => {
-        state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }];
+        state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
       });
 
       expect(wrapper.findComponent(TreeList).exists()).toBe(true);
@@ -603,7 +608,7 @@ describe('diffs/components/app', () => {
 
     it('calls setShowTreeList when only 1 file', () => {
       createComponent({}, ({ state }) => {
-        state.diffs.diffFiles.push({ sha: '123' });
+        state.diffs.treeEntries = { 123: { type: 'blob', fileHash: '123' } };
       });
       jest.spyOn(store, 'dispatch');
       wrapper.vm.setTreeDisplay();
@@ -614,10 +619,12 @@ describe('diffs/components/app', () => {
       });
     });
 
-    it('calls setShowTreeList with true when more than 1 file is in diffs array', () => {
+    it('calls setShowTreeList with true when more than 1 file is in tree entries map', () => {
       createComponent({}, ({ state }) => {
-        state.diffs.diffFiles.push({ sha: '123' });
-        state.diffs.diffFiles.push({ sha: '124' });
+        state.diffs.treeEntries = {
+          111: { type: 'blob', fileHash: '111', path: '111.js' },
+          123: { type: 'blob', fileHash: '123', path: '123.js' },
+        };
       });
       jest.spyOn(store, 'dispatch');
 
@@ -637,7 +644,7 @@ describe('diffs/components/app', () => {
       localStorage.setItem('mr_tree_show', showTreeList);
 
       createComponent({}, ({ state }) => {
-        state.diffs.diffFiles.push({ sha: '123' });
+        state.diffs.treeEntries['123'] = { sha: '123' };
       });
       jest.spyOn(store, 'dispatch');
 
@@ -653,7 +660,10 @@ describe('diffs/components/app', () => {
   describe('file-by-file', () => {
     it('renders a single diff', async () => {
       createComponent({ fileByFileUserPreference: true }, ({ state }) => {
-        state.diffs.diffFiles.push({ file_hash: '123' });
+        state.diffs.treeEntries = {
+          123: { type: 'blob', fileHash: '123' },
+          312: { type: 'blob', fileHash: '312' },
+        };
         state.diffs.diffFiles.push({ file_hash: '312' });
       });
 
@@ -668,7 +678,10 @@ describe('diffs/components/app', () => {
 
       it('sets previous button as disabled', async () => {
         createComponent({ fileByFileUserPreference: true }, ({ state }) => {
-          state.diffs.diffFiles.push({ file_hash: '123' }, { file_hash: '312' });
+          state.diffs.treeEntries = {
+            123: { type: 'blob', fileHash: '123' },
+            312: { type: 'blob', fileHash: '312' },
+          };
         });
 
         await nextTick();
@@ -679,7 +692,10 @@ describe('diffs/components/app', () => {
 
       it('sets next button as disabled', async () => {
         createComponent({ fileByFileUserPreference: true }, ({ state }) => {
-          state.diffs.diffFiles.push({ file_hash: '123' }, { file_hash: '312' });
+          state.diffs.treeEntries = {
+            123: { type: 'blob', fileHash: '123' },
+            312: { type: 'blob', fileHash: '312' },
+          };
           state.diffs.currentDiffFileId = '312';
         });
 
@@ -691,7 +707,7 @@ describe('diffs/components/app', () => {
 
       it("doesn't display when there's fewer than 2 files", async () => {
         createComponent({ fileByFileUserPreference: true }, ({ state }) => {
-          state.diffs.diffFiles.push({ file_hash: '123' });
+          state.diffs.treeEntries = { 123: { type: 'blob', fileHash: '123' } };
           state.diffs.currentDiffFileId = '123';
         });
 
@@ -708,7 +724,10 @@ describe('diffs/components/app', () => {
         'calls navigateToDiffFileIndex with $index when $link is clicked',
         async ({ currentDiffFileId, targetFile }) => {
           createComponent({ fileByFileUserPreference: true }, ({ state }) => {
-            state.diffs.diffFiles.push({ file_hash: '123' }, { file_hash: '312' });
+            state.diffs.treeEntries = {
+              123: { type: 'blob', fileHash: '123' },
+              312: { type: 'blob', fileHash: '312' },
+            };
             state.diffs.currentDiffFileId = currentDiffFileId;
           });
 
diff --git a/spec/frontend/diffs/store/actions_spec.js b/spec/frontend/diffs/store/actions_spec.js
index 614742d026f..b5e773ecdab 100644
--- a/spec/frontend/diffs/store/actions_spec.js
+++ b/spec/frontend/diffs/store/actions_spec.js
@@ -393,7 +393,7 @@ describe('DiffsStoreActions', () => {
       return testAction(
         diffActions.assignDiscussionsToDiff,
         [],
-        { diffFiles: [] },
+        { diffFiles: [], flatBlobsList: [] },
         [],
         [{ type: 'setCurrentDiffFileIdFromNote', payload: '123' }],
       );
@@ -1397,39 +1397,38 @@ describe('DiffsStoreActions', () => {
   describe('setCurrentDiffFileIdFromNote', () => {
     it('commits SET_CURRENT_DIFF_FILE', () => {
       const commit = jest.fn();
-      const state = { diffFiles: [{ file_hash: '123' }] };
+      const getters = { flatBlobsList: [{ fileHash: '123' }] };
       const rootGetters = {
         getDiscussion: () => ({ diff_file: { file_hash: '123' } }),
         notesById: { 1: { discussion_id: '2' } },
       };
 
-      diffActions.setCurrentDiffFileIdFromNote({ commit, state, rootGetters }, '1');
+      diffActions.setCurrentDiffFileIdFromNote({ commit, getters, rootGetters }, '1');
 
       expect(commit).toHaveBeenCalledWith(types.SET_CURRENT_DIFF_FILE, '123');
     });
 
     it('does not commit SET_CURRENT_DIFF_FILE when discussion has no diff_file', () => {
       const commit = jest.fn();
-      const state = { diffFiles: [{ file_hash: '123' }] };
       const rootGetters = {
         getDiscussion: () => ({ id: '1' }),
         notesById: { 1: { discussion_id: '2' } },
       };
 
-      diffActions.setCurrentDiffFileIdFromNote({ commit, state, rootGetters }, '1');
+      diffActions.setCurrentDiffFileIdFromNote({ commit, rootGetters }, '1');
 
       expect(commit).not.toHaveBeenCalled();
     });
 
     it('does not commit SET_CURRENT_DIFF_FILE when diff file does not exist', () => {
       const commit = jest.fn();
-      const state = { diffFiles: [{ file_hash: '123' }] };
+      const getters = { flatBlobsList: [{ fileHash: '123' }] };
       const rootGetters = {
         getDiscussion: () => ({ diff_file: { file_hash: '124' } }),
         notesById: { 1: { discussion_id: '2' } },
       };
 
-      diffActions.setCurrentDiffFileIdFromNote({ commit, state, rootGetters }, '1');
+      diffActions.setCurrentDiffFileIdFromNote({ commit, getters, rootGetters }, '1');
 
       expect(commit).not.toHaveBeenCalled();
     });
@@ -1440,7 +1439,7 @@ describe('DiffsStoreActions', () => {
       return testAction(
         diffActions.navigateToDiffFileIndex,
         0,
-        { diffFiles: [{ file_hash: '123' }] },
+        { flatBlobsList: [{ fileHash: '123' }] },
         [{ type: types.SET_CURRENT_DIFF_FILE, payload: '123' }],
         [],
       );
diff --git a/spec/frontend/diffs/store/getters_spec.js b/spec/frontend/diffs/store/getters_spec.js
index 2e3a66d5b01..70e0689786a 100644
--- a/spec/frontend/diffs/store/getters_spec.js
+++ b/spec/frontend/diffs/store/getters_spec.js
@@ -328,7 +328,11 @@ describe('Diffs Module Getters', () => {
 
   describe('currentDiffIndex', () => {
     it('returns index of currently selected diff in diffList', () => {
-      localState.diffFiles = [{ file_hash: '111' }, { file_hash: '222' }, { file_hash: '333' }];
+      localState.treeEntries = [
+        { type: 'blob', fileHash: '111' },
+        { type: 'blob', fileHash: '222' },
+        { type: 'blob', fileHash: '333' },
+      ];
       localState.currentDiffFileId = '222';
 
       expect(getters.currentDiffIndex(localState)).toEqual(1);
@@ -339,7 +343,11 @@ describe('Diffs Module Getters', () => {
     });
 
     it('returns 0 if no diff is selected yet or diff is not found', () => {
-      localState.diffFiles = [{ file_hash: '111' }, { file_hash: '222' }, { file_hash: '333' }];
+      localState.treeEntries = [
+        { type: 'blob', fileHash: '111' },
+        { type: 'blob', fileHash: '222' },
+        { type: 'blob', fileHash: '333' },
+      ];
       localState.currentDiffFileId = '';
 
       expect(getters.currentDiffIndex(localState)).toEqual(0);