Impove diff discussion datamr-diff-data

Pre-request to https://gitlab.com/gitlab-org/gitlab-ce/issues/48956

2 files changed, 5 insertions, 7 deletions

diff --git a/spec/javascripts/diffs/store/actions_spec.js b/spec/javascripts/diffs/store/actions_spec.js
index 85c1926fcb1..12db3cc6a25 100644
--- a/spec/javascripts/diffs/store/actions_spec.js
+++ b/spec/javascripts/diffs/store/actions_spec.js
@@ -27,7 +27,6 @@ import actions, {
   toggleShowTreeList,
 } from '~/diffs/store/actions';
 import * as types from '~/diffs/store/mutation_types';
-import { reduceDiscussionsToLineCodes } from '~/notes/stores/utils';
 import axios from '~/lib/utils/axios_utils';
 import testAction from '../../helpers/vuex_action_helper';
 
@@ -152,7 +151,7 @@ describe('DiffsStoreActions', () => {
         original_position: diffPosition,
       };
 
-      const discussions = reduceDiscussionsToLineCodes([singleDiscussion]);
+      const discussions = [singleDiscussion];
 
       testAction(
         assignDiscussionsToDiff,
@@ -162,7 +161,7 @@ describe('DiffsStoreActions', () => {
           {
             type: types.SET_LINE_DISCUSSIONS_FOR_FILE,
             payload: {
-              fileHash: 'ABC',
+              diffFile: state.diffFiles[0],
               discussions: [singleDiscussion],
               diffPositionByLineCode: {
                 ABC_1_1: {
@@ -581,7 +580,6 @@ describe('DiffsStoreActions', () => {
   describe('saveDiffDiscussion', () => {
     beforeEach(() => {
       spyOnDependency(actions, 'getNoteFormData').and.returnValue('testData');
-      spyOnDependency(actions, 'reduceDiscussionsToLineCodes').and.returnValue('discussions');
     });
 
     it('dispatches actions', done => {
@@ -602,7 +600,7 @@ describe('DiffsStoreActions', () => {
         .then(() => {
           expect(dispatch.calls.argsFor(0)).toEqual(['saveNote', 'testData', { root: true }]);
           expect(dispatch.calls.argsFor(1)).toEqual(['updateDiscussion', 'test', { root: true }]);
-          expect(dispatch.calls.argsFor(2)).toEqual(['assignDiscussionsToDiff', 'discussions']);
+          expect(dispatch.calls.argsFor(2)).toEqual(['assignDiscussionsToDiff', ['discussion']]);
         })
         .then(done)
         .catch(done.fail);
diff --git a/spec/javascripts/diffs/store/mutations_spec.js b/spec/javascripts/diffs/store/mutations_spec.js
index b7e28391419..3a9c8f3a825 100644
--- a/spec/javascripts/diffs/store/mutations_spec.js
+++ b/spec/javascripts/diffs/store/mutations_spec.js
@@ -222,7 +222,7 @@ describe('DiffsStoreMutations', () => {
       };
 
       mutations[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, {
-        fileHash: 'ABC',
+        diffFile: state.diffFiles[0],
         discussions,
         diffPositionByLineCode,
       });
@@ -292,7 +292,7 @@ describe('DiffsStoreMutations', () => {
       };
 
       mutations[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, {
-        fileHash: 'ABC',
+        diffFile: state.diffFiles[0],
         discussions,
         diffPositionByLineCode,
       });