Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 4 deletions

diff --git a/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js b/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js
index 172b510645d..9f50b12bac2 100644
--- a/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js
+++ b/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js
@@ -298,14 +298,18 @@ describe('Batch comments store actions', () => {
       const draft = {
         discussion_id: '1',
         id: '2',
+        file_path: 'lib/example.js',
       };
 
       actions.scrollToDraft({ dispatch, rootGetters }, draft);
 
-      expect(dispatch.mock.calls[0]).toEqual([
-        'expandDiscussion',
-        { discussionId: '1' },
-        { root: true },
+      expect(dispatch.mock.calls).toEqual([
+        [
+          'diffs/setFileCollapsedAutomatically',
+          { filePath: draft.file_path, collapsed: false },
+          { root: true },
+        ],
+        ['expandDiscussion', { discussionId: '1' }, { root: true }],
       ]);
 
       expect(window.mrTabs.tabShown).toHaveBeenCalledWith('diffs');