Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 5 deletions

diff --git a/spec/frontend/notes/components/discussion_counter_spec.js b/spec/frontend/notes/components/discussion_counter_spec.js
index ac677841ee1..e52dd87f784 100644
--- a/spec/frontend/notes/components/discussion_counter_spec.js
+++ b/spec/frontend/notes/components/discussion_counter_spec.js
@@ -1,11 +1,11 @@
-import { GlDropdownItem } from '@gitlab/ui';
+import { GlDisclosureDropdown, GlDisclosureDropdownItem } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import Vue, { nextTick } from 'vue';
 import Vuex from 'vuex';
 import DiscussionCounter from '~/notes/components/discussion_counter.vue';
 import notesModule from '~/notes/stores/modules';
 import * as types from '~/notes/stores/mutation_types';
-import { noteableDataMock, discussionMock, notesDataMock, userDataMock } from '../mock_data';
+import { discussionMock, noteableDataMock, notesDataMock, userDataMock } from '../mock_data';
 
 describe('DiscussionCounter component', () => {
   let store;
@@ -101,9 +101,24 @@ describe('DiscussionCounter component', () => {
     `('renders correctly if $title', async ({ resolved, groupLength }) => {
       updateStore({ resolvable: true, resolved });
       wrapper = mount(DiscussionCounter, { store, propsData: { blocksMerge: true } });
-      await wrapper.find('.dropdown-toggle').trigger('click');
+      await wrapper.findComponent(GlDisclosureDropdown).trigger('click');
 
-      expect(wrapper.findAllComponents(GlDropdownItem)).toHaveLength(groupLength);
+      expect(wrapper.findAllComponents(GlDisclosureDropdownItem)).toHaveLength(groupLength);
+    });
+
+    describe('resolve all with new issue link', () => {
+      it('has correct href prop', async () => {
+        updateStore({ resolvable: true });
+        wrapper = mount(DiscussionCounter, { store, propsData: { blocksMerge: true } });
+
+        const resolveDiscussionsPath =
+          store.getters.getNoteableData.create_issue_to_resolve_discussions_path;
+
+        await wrapper.findComponent(GlDisclosureDropdown).trigger('click');
+        const resolveAllLink = wrapper.find('[data-testid="resolve-all-with-issue-link"]');
+
+        expect(resolveAllLink.attributes('href')).toBe(resolveDiscussionsPath);
+      });
     });
   });
 
@@ -114,7 +129,7 @@ describe('DiscussionCounter component', () => {
       store.commit(types.ADD_OR_UPDATE_DISCUSSIONS, [discussion]);
       store.dispatch('updateResolvableDiscussionsCounts');
       wrapper = mount(DiscussionCounter, { store, propsData: { blocksMerge: true } });
-      await wrapper.find('.dropdown-toggle').trigger('click');
+      await wrapper.findComponent(GlDisclosureDropdown).trigger('click');
       toggleAllButton = wrapper.find('[data-testid="toggle-all-discussions-btn"]');
     };