Add latest changes from gitlab-org/gitlab@master

3 files changed, 148 insertions, 12 deletions

diff --git a/spec/javascripts/diffs/store/actions_spec.js b/spec/javascripts/diffs/store/actions_spec.js
index af2dd7b4f93..ff17d8ec158 100644
--- a/spec/javascripts/diffs/store/actions_spec.js
+++ b/spec/javascripts/diffs/store/actions_spec.js
@@ -158,16 +158,19 @@ describe('DiffsStoreActions', () => {
       const res1 = { diff_files: [], pagination: { next_page: 2 } };
       const res2 = { diff_files: [], pagination: {} };
       mock
-        .onGet(endpointBatch, { params: { page: undefined, per_page: DIFFS_PER_PAGE, w: '1' } })
-        .reply(200, res1);
-      mock
-        .onGet(endpointBatch, { params: { page: 2, per_page: DIFFS_PER_PAGE, w: '1' } })
+        .onGet(endpointBatch, {
+          params: { page: 1, per_page: DIFFS_PER_PAGE, w: '1', view: 'inline' },
+        })
+        .reply(200, res1)
+        .onGet(endpointBatch, {
+          params: { page: 2, per_page: DIFFS_PER_PAGE, w: '1', view: 'inline' },
+        })
         .reply(200, res2);
 
       testAction(
         fetchDiffFilesBatch,
         {},
-        { endpointBatch },
+        { endpointBatch, useSingleDiffStyle: true, diffViewType: 'inline' },
         [
           { type: types.SET_BATCH_LOADING, payload: true },
           { type: types.SET_RETRIEVING_BATCHES, payload: true },
@@ -188,7 +191,7 @@ describe('DiffsStoreActions', () => {
 
   describe('fetchDiffFilesMeta', () => {
     it('should fetch diff meta information', done => {
-      const endpointMetadata = '/fetch/diffs_meta';
+      const endpointMetadata = '/fetch/diffs_meta?view=inline';
       const mock = new MockAdapter(axios);
       const data = { diff_files: [] };
       const res = { data };
@@ -213,6 +216,108 @@ describe('DiffsStoreActions', () => {
     });
   });
 
+  describe('when the single diff view feature flag is off', () => {
+    describe('fetchDiffFiles', () => {
+      it('should fetch diff files', done => {
+        const endpoint = '/fetch/diff/files?w=1';
+        const mock = new MockAdapter(axios);
+        const res = { diff_files: 1, merge_request_diffs: [] };
+        mock.onGet(endpoint).reply(200, res);
+
+        testAction(
+          fetchDiffFiles,
+          {},
+          {
+            endpoint,
+            diffFiles: [],
+            showWhitespace: false,
+            diffViewType: 'inline',
+            useSingleDiffStyle: false,
+          },
+          [
+            { type: types.SET_LOADING, payload: true },
+            { type: types.SET_LOADING, payload: false },
+            { type: types.SET_MERGE_REQUEST_DIFFS, payload: res.merge_request_diffs },
+            { type: types.SET_DIFF_DATA, payload: res },
+          ],
+          [],
+          () => {
+            mock.restore();
+            done();
+          },
+        );
+
+        fetchDiffFiles({ state: { endpoint }, commit: () => null })
+          .then(data => {
+            expect(data).toEqual(res);
+            done();
+          })
+          .catch(done.fail);
+      });
+    });
+
+    describe('fetchDiffFilesBatch', () => {
+      it('should fetch batch diff files', done => {
+        const endpointBatch = '/fetch/diffs_batch';
+        const mock = new MockAdapter(axios);
+        const res1 = { diff_files: [], pagination: { next_page: 2 } };
+        const res2 = { diff_files: [], pagination: {} };
+        mock
+          .onGet(endpointBatch, { params: { page: 1, per_page: DIFFS_PER_PAGE, w: '1' } })
+          .reply(200, res1)
+          .onGet(endpointBatch, { params: { page: 2, per_page: DIFFS_PER_PAGE, w: '1' } })
+          .reply(200, res2);
+
+        testAction(
+          fetchDiffFilesBatch,
+          {},
+          { endpointBatch, useSingleDiffStyle: false },
+          [
+            { type: types.SET_BATCH_LOADING, payload: true },
+            { 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_DIFF_DATA_BATCH, payload: { diff_files: [] } },
+            { type: types.SET_BATCH_LOADING, payload: false },
+            { type: types.SET_RETRIEVING_BATCHES, payload: false },
+          ],
+          [],
+          () => {
+            mock.restore();
+            done();
+          },
+        );
+      });
+    });
+
+    describe('fetchDiffFilesMeta', () => {
+      it('should fetch diff meta information', done => {
+        const endpointMetadata = '/fetch/diffs_meta?';
+        const mock = new MockAdapter(axios);
+        const data = { diff_files: [] };
+        const res = { data };
+        mock.onGet(endpointMetadata).reply(200, res);
+
+        testAction(
+          fetchDiffFilesMeta,
+          {},
+          { endpointMetadata, useSingleDiffStyle: false },
+          [
+            { type: types.SET_LOADING, payload: true },
+            { type: types.SET_LOADING, payload: false },
+            { type: types.SET_MERGE_REQUEST_DIFFS, payload: [] },
+            { type: types.SET_DIFF_DATA, payload: { data } },
+          ],
+          [],
+          () => {
+            mock.restore();
+            done();
+          },
+        );
+      });
+    });
+  });
+
   describe('setHighlightedRow', () => {
     it('should mark currently selected diff and set lineHash and fileHash of highlightedRow', () => {
       testAction(setHighlightedRow, 'ABC_123', {}, [
diff --git a/spec/javascripts/diffs/store/mutations_spec.js b/spec/javascripts/diffs/store/mutations_spec.js
index 24405dcc796..cb89a89e216 100644
--- a/spec/javascripts/diffs/store/mutations_spec.js
+++ b/spec/javascripts/diffs/store/mutations_spec.js
@@ -55,8 +55,8 @@ describe('DiffsStoreMutations', () => {
       const state = {
         diffFiles: [
           {
-            content_sha: diffFileMockData.content_sha,
-            file_hash: diffFileMockData.file_hash,
+            ...diffFileMockData,
+            parallel_diff_lines: [],
           },
         ],
       };
diff --git a/spec/javascripts/diffs/store/utils_spec.js b/spec/javascripts/diffs/store/utils_spec.js
index 638b4510221..051820cedfa 100644
--- a/spec/javascripts/diffs/store/utils_spec.js
+++ b/spec/javascripts/diffs/store/utils_spec.js
@@ -333,10 +333,10 @@ describe('DiffsStoreUtils', () => {
         diff_files: [Object.assign({}, mock, { highlighted_diff_lines: undefined })],
       };
 
-      utils.prepareDiffData(preparedDiff);
-      utils.prepareDiffData(splitInlineDiff);
-      utils.prepareDiffData(splitParallelDiff);
-      utils.prepareDiffData(completedDiff, [mock]);
+      preparedDiff.diff_files = utils.prepareDiffData(preparedDiff);
+      splitInlineDiff.diff_files = utils.prepareDiffData(splitInlineDiff);
+      splitParallelDiff.diff_files = utils.prepareDiffData(splitParallelDiff);
+      completedDiff.diff_files = utils.prepareDiffData(completedDiff, [mock]);
     });
 
     it('sets the renderIt and collapsed attribute on files', () => {
@@ -390,6 +390,37 @@ describe('DiffsStoreUtils', () => {
       expect(completedDiff.diff_files[0].parallel_diff_lines.length).toBeGreaterThan(0);
       expect(completedDiff.diff_files[0].highlighted_diff_lines.length).toBeGreaterThan(0);
     });
+
+    it('leaves files in the existing state', () => {
+      const priorFiles = [mock];
+      const fakeNewFile = {
+        ...mock,
+        content_sha: 'ABC',
+        file_hash: 'DEF',
+      };
+      const updatedFilesList = utils.prepareDiffData({ diff_files: [fakeNewFile] }, priorFiles);
+
+      expect(updatedFilesList).toEqual([mock, fakeNewFile]);
+    });
+
+    it('completes an existing split diff without overwriting existing diffs', () => {
+      // The current state has a file that has only loaded inline lines
+      const priorFiles = [{ ...mock, parallel_diff_lines: [] }];
+      // The next (batch) load loads two files: the other half of that file, and a new file
+      const fakeBatch = [
+        { ...mock, highlighted_diff_lines: undefined },
+        { ...mock, highlighted_diff_lines: undefined, content_sha: 'ABC', file_hash: 'DEF' },
+      ];
+      const updatedFilesList = utils.prepareDiffData({ diff_files: fakeBatch }, priorFiles);
+
+      expect(updatedFilesList).toEqual([
+        mock,
+        jasmine.objectContaining({
+          content_sha: 'ABC',
+          file_hash: 'DEF',
+        }),
+      ]);
+    });
   });
 
   describe('isDiscussionApplicableToLine', () => {