Fixed multiple diff line discussions not expanding

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53600

2 files changed, 39 insertions, 0 deletions

diff --git a/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js b/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js
index ad2605a5c5c..f0f97a9dd34 100644
--- a/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js
+++ b/spec/javascripts/diffs/components/diff_gutter_avatars_spec.js
@@ -89,6 +89,35 @@ describe('DiffGutterAvatars', () => {
         expect(component.discussions[0].expanded).toEqual(false);
         component.$store.dispatch('setInitialNotes', []);
       });
+
+      it('forces expansion of all discussions', () => {
+        spyOn(component.$store, 'dispatch');
+
+        component.discussions[0].expanded = true;
+        component.discussions.push({
+          ...component.discussions[0],
+          id: '123test',
+          expanded: false,
+        });
+
+        component.toggleDiscussions();
+
+        expect(component.$store.dispatch.calls.argsFor(0)).toEqual([
+          'toggleDiscussion',
+          {
+            discussionId: component.discussions[0].id,
+            shouldExpand: true,
+          },
+        ]);
+
+        expect(component.$store.dispatch.calls.argsFor(1)).toEqual([
+          'toggleDiscussion',
+          {
+            discussionId: component.discussions[1].id,
+            shouldExpand: true,
+          },
+        ]);
+      });
     });
   });
 
diff --git a/spec/javascripts/notes/stores/mutation_spec.js b/spec/javascripts/notes/stores/mutation_spec.js
index 1c4449d1055..bca87a53b1a 100644
--- a/spec/javascripts/notes/stores/mutation_spec.js
+++ b/spec/javascripts/notes/stores/mutation_spec.js
@@ -297,6 +297,16 @@ describe('Notes Store mutations', () => {
 
       expect(state.discussions[0].expanded).toEqual(false);
     });
+
+    it('forces a discussions expanded state', () => {
+      const state = {
+        discussions: [{ ...discussionMock, expanded: false }],
+      };
+
+      mutations.TOGGLE_DISCUSSION(state, { discussionId: discussionMock.id, shouldExpand: true });
+
+      expect(state.discussions[0].expanded).toEqual(true);
+    });
   });
 
   describe('UPDATE_NOTE', () => {