Add latest changes from gitlab-org/gitlab@master

1 files changed, 29 insertions, 0 deletions

diff --git a/spec/frontend/notes/mixins/discussion_navigation_spec.js b/spec/frontend/notes/mixins/discussion_navigation_spec.js
index ecff95b6fe0..32c6cfb110e 100644
--- a/spec/frontend/notes/mixins/discussion_navigation_spec.js
+++ b/spec/frontend/notes/mixins/discussion_navigation_spec.js
@@ -66,6 +66,35 @@ describe('Discussion navigation mixin', () => {
   const findDiscussion = (selector, id) =>
     document.querySelector(`${selector}[data-discussion-id="${id}"]`);
 
+  describe('jumpToFirstUnresolvedDiscussion method', () => {
+    let vm;
+
+    beforeEach(() => {
+      createComponent();
+
+      ({ vm } = wrapper);
+
+      jest.spyOn(store, 'dispatch');
+      jest.spyOn(vm, 'jumpToNextDiscussion');
+    });
+
+    it('triggers the setCurrentDiscussionId action with null as the value', () => {
+      vm.jumpToFirstUnresolvedDiscussion();
+
+      expect(store.dispatch).toHaveBeenCalledWith('setCurrentDiscussionId', null);
+    });
+
+    it('triggers the jumpToNextDiscussion action when the previous store action succeeds', () => {
+      store.dispatch.mockResolvedValue();
+
+      vm.jumpToFirstUnresolvedDiscussion();
+
+      return vm.$nextTick().then(() => {
+        expect(vm.jumpToNextDiscussion).toHaveBeenCalled();
+      });
+    });
+  });
+
   describe('cycle through discussions', () => {
     beforeEach(() => {
       window.mrTabs = { eventHub: createEventHub(), tabShown: jest.fn() };