From cb6bc902ed1f89e7f94caa86b75e756b9163af51 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 9 Jul 2018 16:13:10 +0100
Subject: Removes hardcoded and unused prop

---
 app/assets/javascripts/diffs/components/diff_file.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 060386c3ecb..a61e368249a 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -31,9 +31,6 @@ export default {
     };
   },
   computed: {
-    isDiscussionsExpanded() {
-      return true; // TODO: @fatihacet - Fix this.
-    },
     isCollapsed() {
       return this.file.collapsed || false;
     },
@@ -131,7 +128,6 @@ export default {
       :diff-file="file"
       :collapsible="true"
       :expanded="!isCollapsed"
-      :discussions-expanded="isDiscussionsExpanded"
       :add-merge-request-buttons="true"
       class="js-file-title file-title"
       @toggleFile="handleToggle"
-- 
cgit v1.2.1


From ac71675d3096ac9317ea230a408d69029bdadc73 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 9 Jul 2018 18:13:41 +0100
Subject: Fixes toggle discussion button not expanding collapsed discussions

Discussions were being toggled by jquery DOM querying them and toggling
visibility but in vue, only the open discussions will be in the DOM
Fix includes:
 - Adds a getter to the store to get the expanded discussions
 - Adds an action to collapse a discussion
 - When the user clicks the button, all data needed is now accessible
   through a getter and we can dispatch an action to toggle the discussion
   within the state, instead of showing/hiding with jQuery
 - Removes hardcoded properties

Resolves #48237
---
 .../diffs/components/diff_file_header.vue          | 17 +++++++---
 app/assets/javascripts/diffs/store/actions.js      | 31 +++++++++++++++++++
 app/assets/javascripts/diffs/store/getters.js      | 36 +++++++++++++++++++++-
 app/assets/javascripts/notes/stores/actions.js     |  2 ++
 .../javascripts/notes/stores/mutation_types.js     |  4 +++
 app/assets/javascripts/notes/stores/mutations.js   |  5 +++
 .../unreleased/48237-toggle-file-comments.yml      |  5 +++
 7 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/48237-toggle-file-comments.yml

diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 1957698c6c1..ac4f37512ec 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -1,5 +1,6 @@
 <script>
 import _ from 'underscore';
+import { mapActions, mapGetters } from 'vuex';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import Icon from '~/vue_shared/components/icon.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
@@ -54,6 +55,10 @@ export default {
     };
   },
   computed: {
+    ...mapGetters('diffs', ['diffHasExpandedDiscussions']),
+    hasExpandedDiscussions() {
+      return this.diffHasExpandedDiscussions(this.diffFile);
+    },
     icon() {
       if (this.diffFile.submodule) {
         return 'archive';
@@ -88,9 +93,6 @@ export default {
     collapseIcon() {
       return this.expanded ? 'chevron-down' : 'chevron-right';
     },
-    isDiscussionsExpanded() {
-      return this.discussionsExpanded && this.expanded;
-    },
     viewFileButtonText() {
       const truncatedContentSha = _.escape(truncateSha(this.diffFile.contentSha));
       return sprintf(
@@ -113,6 +115,7 @@ export default {
     },
   },
   methods: {
+    ...mapActions('diffs', ['toggleFileDiscussions']),
     handleToggle(e, checkTarget) {
       if (
         !checkTarget ||
@@ -125,6 +128,9 @@ export default {
     showForkMessage() {
       this.$emit('showForkMessage');
     },
+    handleToggleDiscussions(){
+      this.toggleFileDiscussions(this.diffFile);
+    },
   },
 };
 </script>
@@ -216,9 +222,10 @@ export default {
         v-if="diffFile.blob && diffFile.blob.readableText"
       >
         <button
-          :class="{ active: isDiscussionsExpanded }"
+          :class="{ active: hasExpandedDiscussions }"
           :title="s__('MergeRequests|Toggle comments for this file')"
-          class="btn js-toggle-diff-comments"
+          @click="handleToggleDiscussions"
+          class="btn"
           type="button"
         >
           <icon name="comment" />
diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js
index 5e0fd5109bb..2e6092d7e87 100644
--- a/app/assets/javascripts/diffs/store/actions.js
+++ b/app/assets/javascripts/diffs/store/actions.js
@@ -82,6 +82,36 @@ export const expandAllFiles = ({ commit }) => {
   commit(types.EXPAND_ALL_FILES);
 };
 
+/**
+ * Toggles the file discussions after user clicked on the toggle discussions button.
+ *
+ * Gets the discussions for the provided diff.
+ *
+ * If all discussions are expanded, it will collapse all of them
+ * If all discussions are collapsed, it will expand all of them
+ * If some discussions are open and others closed, it will expand the closed ones.
+ *
+ * @param {Object} diff
+ */
+export const toggleFileDiscussions = ({ getters, dispatch }, diff) => {
+  const discussions = getters.getDiffFileDiscussions(diff);
+
+  const shouldCloseAll = getters.diffHasAllExpandedDiscussions(diff);
+  const shouldExpandAll = getters.diffHasAllCollpasedDiscussions(diff);
+
+  discussions.forEach(discussion => {
+    const data = { discussionId: discussion.id };
+
+    if (shouldCloseAll) {
+      dispatch('collapseDiscussion', data, { root: true });
+    } else if (shouldExpandAll) {
+      dispatch('expandDiscussion', data, { root: true });
+    } else if (!shouldCloseAll && !shouldExpandAll && !discussion.expanded) {
+      dispatch('expandDiscussion', data, { root: true });
+    }
+  });
+};
+
 export default {
   setBaseConfig,
   fetchDiffFiles,
@@ -92,4 +122,5 @@ export default {
   loadMoreLines,
   loadCollapsedDiff,
   expandAllFiles,
+  toggleFileDiscussions,
 };
diff --git a/app/assets/javascripts/diffs/store/getters.js b/app/assets/javascripts/diffs/store/getters.js
index f3c2d7427e7..9a8d27d0b04 100644
--- a/app/assets/javascripts/diffs/store/getters.js
+++ b/app/assets/javascripts/diffs/store/getters.js
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE } from '../constants';
 
 export const isParallelView = state => state.diffViewType === PARALLEL_DIFF_VIEW_TYPE;
@@ -8,5 +9,38 @@ export const areAllFilesCollapsed = state => state.diffFiles.every(file => file.
 
 export const commitId = state => (state.commit && state.commit.id ? state.commit.id : null);
 
-// prevent babel-plugin-rewire from generating an invalid default during karma tests
+/**
+ * Checks if the diff has all discussions expanded
+ * @param {Object} diff
+ * @returns {Boolean}
+ */
+export const diffHasAllExpandedDiscussions = (state, getters) => diff => {
+  const discussions = getters.getDiffFileDiscussions(diff);
+
+  return (discussions.length && discussions.every(discussion => discussion.expanded)) || false;
+};
+
+/**
+ * Checks if the diff has all discussions collpased
+ * @param {Object} diff
+ * @returns {Boolean}
+ */
+export const diffHasAllCollpasedDiscussions = (state, getters) => diff => {
+  const discussions = getters.getDiffFileDiscussions(diff);
+
+  return (discussions.length && discussions.every(discussion => !discussion.expanded)) || false;
+};
+
+/**
+ * Returns an array with the discussions of the given diff
+ * @param {Object} diff
+ * @returns {Array}
+ */
+export const getDiffFileDiscussions = (state, getters, rootState, rootGetters) => diff =>
+  rootGetters.discussions.filter(
+    discussion =>
+      discussion.diff_discussion && _.isEqual(discussion.diff_file.file_hash, diff.fileHash),
+  ) || [];
+
+// prevent babel-plugin-rewire from generating an invalid default during karma∂ tests
 export default () => {};
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index b2bf86eea56..3eefbe11c37 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -15,6 +15,8 @@ let eTagPoll;
 
 export const expandDiscussion = ({ commit }, data) => commit(types.EXPAND_DISCUSSION, data);
 
+export const collapseDiscussion = ({ commit }, data) => commit(types.COLLAPSE_DISCUSSION, data);
+
 export const setNotesData = ({ commit }, data) => commit(types.SET_NOTES_DATA, data);
 
 export const setNoteableData = ({ commit }, data) => commit(types.SET_NOTEABLE_DATA, data);
diff --git a/app/assets/javascripts/notes/stores/mutation_types.js b/app/assets/javascripts/notes/stores/mutation_types.js
index a25098fbc06..6c1ffdf266b 100644
--- a/app/assets/javascripts/notes/stores/mutation_types.js
+++ b/app/assets/javascripts/notes/stores/mutation_types.js
@@ -17,6 +17,10 @@ export const UPDATE_DISCUSSION = 'UPDATE_DISCUSSION';
 export const SET_DISCUSSION_DIFF_LINES = 'SET_DISCUSSION_DIFF_LINES';
 export const SET_NOTES_FETCHED_STATE = 'SET_NOTES_FETCHED_STATE';
 
+// DISCUSSION
+
+export const COLLAPSE_DISCUSSION = 'COLLAPSE_DISCUSSION';
+
 // Issue
 export const CLOSE_ISSUE = 'CLOSE_ISSUE';
 export const REOPEN_ISSUE = 'REOPEN_ISSUE';
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index a1849269010..ab6a95e2601 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -58,6 +58,11 @@ export default {
     discussion.expanded = true;
   },
 
+  [types.COLLAPSE_DISCUSSION](state, { discussionId }) {
+    const discussion = utils.findNoteObjectById(state.discussions, discussionId);
+    discussion.expanded = false;
+  },
+
   [types.REMOVE_PLACEHOLDER_NOTES](state) {
     const { discussions } = state;
 
diff --git a/changelogs/unreleased/48237-toggle-file-comments.yml b/changelogs/unreleased/48237-toggle-file-comments.yml
new file mode 100644
index 00000000000..9c9b8e95691
--- /dev/null
+++ b/changelogs/unreleased/48237-toggle-file-comments.yml
@@ -0,0 +1,5 @@
+---
+title: Fixes toggle discussion button not expanding collapsed discussions
+merge_request:
+author:
+type: fixed
-- 
cgit v1.2.1


From 57c32c7dbdd470b1ea31edf412e8bb0aa6261e21 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 11 Jul 2018 12:43:51 +0100
Subject: Adds specs for getters in merge request vuex diff module

---
 app/assets/javascripts/diffs/store/actions.js      |   1 -
 .../diffs/components/diff_file_header_spec.js      |   2 +-
 spec/javascripts/diffs/store/getters_spec.js       | 122 +++++----------------
 3 files changed, 30 insertions(+), 95 deletions(-)

diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js
index 18caf87d6da..e5bb9904664 100644
--- a/app/assets/javascripts/diffs/store/actions.js
+++ b/app/assets/javascripts/diffs/store/actions.js
@@ -95,7 +95,6 @@ export const expandAllFiles = ({ commit }) => {
  */
 export const toggleFileDiscussions = ({ getters, dispatch }, diff) => {
   const discussions = getters.getDiffFileDiscussions(diff);
-
   const shouldCloseAll = getters.diffHasAllExpandedDiscussions(diff);
   const shouldExpandAll = getters.diffHasAllCollpasedDiscussions(diff);
 
diff --git a/spec/javascripts/diffs/components/diff_file_header_spec.js b/spec/javascripts/diffs/components/diff_file_header_spec.js
index e4658a635f5..0f3a95da5bf 100644
--- a/spec/javascripts/diffs/components/diff_file_header_spec.js
+++ b/spec/javascripts/diffs/components/diff_file_header_spec.js
@@ -4,7 +4,7 @@ import diffsModule from '~/diffs/store/modules';
 import notesModule from '~/notes/stores/modules';
 import DiffFileHeader from '~/diffs/components/diff_file_header.vue';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-import mountComponent, { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
+import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
 
 const discussionFixture = 'merge_requests/diff_discussion.json';
 
diff --git a/spec/javascripts/diffs/store/getters_spec.js b/spec/javascripts/diffs/store/getters_spec.js
index bddf4d2aeac..919b612bb6a 100644
--- a/spec/javascripts/diffs/store/getters_spec.js
+++ b/spec/javascripts/diffs/store/getters_spec.js
@@ -5,9 +5,20 @@ import discussion from '../mock_data/diff_discussions';
 
 describe('Diffs Module Getters', () => {
   let localState;
+  let discussionMock;
+  let discussionMock1;
+
+  const diffFileMock = {
+    fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
+  };
 
   beforeEach(() => {
     localState = state();
+    discussionMock = Object.assign({}, discussion);
+    discussionMock.diff_file.file_hash = diffFileMock.fileHash;
+
+    discussionMock1 = Object.assign({}, discussion);
+    discussionMock1.diff_file.file_hash = diffFileMock.fileHash;
   });
 
   describe('isParallelView', () => {
@@ -67,13 +78,6 @@ describe('Diffs Module Getters', () => {
 
   describe('diffHasAllExpandedDiscussions', () => {
     it('returns true when all discussions are expanded', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
-      const discussionMock = Object.assign({}, discussion);
-      discussionMock.diff_file.file_hash = diffFileMock.fileHash;
-
       expect(
         getters.diffHasAllExpandedDiscussions(localState, {
           getDiffFileDiscussions: () => [discussionMock, discussionMock],
@@ -82,10 +86,6 @@ describe('Diffs Module Getters', () => {
     });
 
     it('returns false when there are no discussions', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
       expect(
         getters.diffHasAllExpandedDiscussions(localState, {
           getDiffFileDiscussions: () => [],
@@ -94,15 +94,6 @@ describe('Diffs Module Getters', () => {
     });
 
     it('returns false when one discussions is collapsed', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
-      const discussionMock = Object.assign({}, discussion);
-      discussionMock.diff_file.file_hash = diffFileMock.fileHash;
-      const discussionMock1 = Object.assign({}, discussion);
-      discussionMock1.diff_file.file_hash = diffFileMock.fileHash;
-
       discussionMock1.expanded = false;
 
       expect(
@@ -115,11 +106,6 @@ describe('Diffs Module Getters', () => {
 
   describe('diffHasAllCollpasedDiscussions', () => {
     it('returns true when all discussions are collapsed', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
-      const discussionMock = Object.assign({}, discussion);
       discussionMock.diff_file.file_hash = diffFileMock.fileHash;
       discussionMock.expanded = false;
 
@@ -131,10 +117,6 @@ describe('Diffs Module Getters', () => {
     });
 
     it('returns false when there are no discussions', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
       expect(
         getters.diffHasAllCollpasedDiscussions(localState, {
           getDiffFileDiscussions: () => [],
@@ -143,14 +125,6 @@ describe('Diffs Module Getters', () => {
     });
 
     it('returns false when one discussions is expanded', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
-      const discussionMock = Object.assign({}, discussion);
-      discussionMock.diff_file.file_hash = diffFileMock.fileHash;
-      const discussionMock1 = Object.assign({}, discussion);
-      discussionMock1.diff_file.file_hash = diffFileMock.fileHash;
       discussionMock1.expanded = false;
 
       expect(
@@ -163,14 +137,6 @@ describe('Diffs Module Getters', () => {
 
   describe('diffHasExpandedDiscussions', () => {
     it('returns true when one of the discussions is expanded', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
-      const discussionMock = Object.assign({}, discussion);
-      discussionMock.diff_file.file_hash = diffFileMock.fileHash;
-      const discussionMock1 = Object.assign({}, discussion);
-      discussionMock1.diff_file.file_hash = diffFileMock.fileHash;
       discussionMock1.expanded = false;
 
       expect(
@@ -181,10 +147,6 @@ describe('Diffs Module Getters', () => {
     });
 
     it('returns false when there are no discussions', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
       expect(
         getters.diffHasExpandedDiscussions(localState, { getDiffFileDiscussions: () => [] })(
           diffFileMock,
@@ -193,17 +155,7 @@ describe('Diffs Module Getters', () => {
     });
 
     it('returns false when no discussion is expanded', () => {
-      const diffFileMock = {
-        fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-      };
-
-      const discussionMock = Object.assign({}, discussion);
-      discussion.diff_file.file_hash = diffFileMock.fileHash;
       discussionMock.expanded = false;
-
-      const discussionMock1 = Object.assign({}, discussion);
-      discussionMock1.diff_file.file_hash = diffFileMock.fileHash;
-
       discussionMock1.expanded = false;
 
       expect(
@@ -214,38 +166,22 @@ describe('Diffs Module Getters', () => {
     });
   });
 
-  // describe('getDiffFileDiscussions', () => {
-  //   it('returns an array with discussions when fileHash matches and the discussion belongs to a diff', () => {
-  //     const diffFileMock = {
-  //       fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-  //     };
-
-  //     const discussionMock = Object.assign({}, discussion);
-  //     discussionMock.diff_file.file_hash = diffFileMock.fileHash;
-
-  //     expect(
-  //       getters.getDiffFileDiscussions(
-  //         localState,
-  //         {},
-  //         {},
-  //         { discussions: [discussionMock] },
-  //       )(diffFileMock).length,
-  //     ).toEqual(1);
-  //   });
-
-  //   it('returns an empty array when no discussions are found in the given diff', () => {
-  //     const diffFileMock = {
-  //       fileHash: '9732849daca6ae818696d9575f5d1207d1a7f8bb',
-  //     };
-
-  //     expect(
-  //       getters.getDiffFileDiscussions(
-  //         localState,
-  //         {},
-  //         {},
-  //         { discussions: () => ([]) },
-  //       )(diffFileMock).length,
-  //     ).toEqual(0);
-  //   });
-  // });
+  describe('getDiffFileDiscussions', () => {
+    it('returns an array with discussions when fileHash matches and the discussion belongs to a diff', () => {
+      discussionMock.diff_file.file_hash = diffFileMock.fileHash;
+
+      expect(
+        getters.getDiffFileDiscussions(localState, {}, {}, { discussions: [discussionMock] })(
+          diffFileMock,
+        ).length,
+      ).toEqual(1);
+    });
+
+    it('returns an empty array when no discussions are found in the given diff', () => {
+      expect(
+        getters.getDiffFileDiscussions(localState, {}, {}, { discussions: [] })(diffFileMock)
+          .length,
+      ).toEqual(0);
+    });
+  });
 });
-- 
cgit v1.2.1


From c5a514de767f1d6b66443552bdc16d09370d9d07 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Wed, 11 Jul 2018 15:30:41 +0100
Subject: Adds specs for toggleFileDiscussions action

---
 app/assets/javascripts/diffs/store/actions.js |  4 +--
 spec/javascripts/diffs/store/actions_spec.js  | 44 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js
index e5bb9904664..27001142257 100644
--- a/app/assets/javascripts/diffs/store/actions.js
+++ b/app/assets/javascripts/diffs/store/actions.js
@@ -103,9 +103,7 @@ export const toggleFileDiscussions = ({ getters, dispatch }, diff) => {
 
     if (shouldCloseAll) {
       dispatch('collapseDiscussion', data, { root: true });
-    } else if (shouldExpandAll) {
-      dispatch('expandDiscussion', data, { root: true });
-    } else if (!shouldCloseAll && !shouldExpandAll && !discussion.expanded) {
+    } else if (shouldExpandAll || (!shouldCloseAll && !shouldExpandAll && !discussion.expanded)) {
       dispatch('expandDiscussion', data, { root: true });
     }
   });
diff --git a/spec/javascripts/diffs/store/actions_spec.js b/spec/javascripts/diffs/store/actions_spec.js
index 6829c1e956a..c1560dac1a0 100644
--- a/spec/javascripts/diffs/store/actions_spec.js
+++ b/spec/javascripts/diffs/store/actions_spec.js
@@ -191,4 +191,48 @@ describe('DiffsStoreActions', () => {
       );
     });
   });
+
+  describe('toggleFileDiscussions', () => {
+    it('should dispatch collapseDiscussion when all discussions are expanded', () => {
+      const getters = {
+        getDiffFileDiscussions: jasmine.createSpy().and.returnValue([{ id: 1 }]),
+        diffHasAllExpandedDiscussions: jasmine.createSpy().and.returnValue(true),
+        diffHasAllCollpasedDiscussions: jasmine.createSpy().and.returnValue(false),
+      };
+
+      const dispatch = jasmine.createSpy('dispatch');
+
+      actions.toggleFileDiscussions({ getters, dispatch });
+
+      expect(dispatch).toHaveBeenCalledWith('collapseDiscussion', { discussionId: 1 }, { root: true });
+    });
+
+    it('should dispatch expandDiscussion when all discussions are collapsed', () => {
+      const getters = {
+        getDiffFileDiscussions: jasmine.createSpy().and.returnValue([{ id: 1 }]),
+        diffHasAllExpandedDiscussions: jasmine.createSpy().and.returnValue(false),
+        diffHasAllCollpasedDiscussions: jasmine.createSpy().and.returnValue(true),
+      };
+
+      const dispatch = jasmine.createSpy();
+
+      actions.toggleFileDiscussions({ getters, dispatch });
+
+      expect(dispatch).toHaveBeenCalledWith('expandDiscussion', { discussionId: 1 }, { root: true });
+    });
+
+    it('should dispatch expandDiscussion when some discussions are collapsed and others are expanded for the collapsed discussion', () => {
+      const getters = {
+        getDiffFileDiscussions: jasmine.createSpy().and.returnValue([{ expanded: false, id: 1 }]),
+        diffHasAllExpandedDiscussions: jasmine.createSpy().and.returnValue(false),
+        diffHasAllCollpasedDiscussions: jasmine.createSpy().and.returnValue(false),
+      };
+
+      const dispatch = jasmine.createSpy();
+
+      actions.toggleFileDiscussions({ getters, dispatch });
+
+      expect(dispatch).toHaveBeenCalledWith('expandDiscussion', { discussionId: 1 }, { root: true });
+    });
+  });
 });
-- 
cgit v1.2.1