Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 13 insertions, 1 deletions

diff --git a/spec/frontend/notes/components/discussion_actions_spec.js b/spec/frontend/notes/components/discussion_actions_spec.js
index 44dc148933c..3e1e43d0c6a 100644
--- a/spec/frontend/notes/components/discussion_actions_spec.js
+++ b/spec/frontend/notes/components/discussion_actions_spec.js
@@ -21,7 +21,7 @@ const createUnallowedNote = () =>
 
 describe('DiscussionActions', () => {
   let wrapper;
-  const createComponentFactory = (shallow = true) => props => {
+  const createComponentFactory = (shallow = true) => (props, options) => {
     const store = createStore();
     const mountFn = shallow ? shallowMount : mount;
 
@@ -35,6 +35,11 @@ describe('DiscussionActions', () => {
         shouldShowJumpToNextDiscussion: true,
         ...props,
       },
+      provide: {
+        glFeatures: {
+          hideJumpToNextUnresolvedInThreads: options?.hideJumpToNextUnresolvedInThreads,
+        },
+      },
     });
   };
 
@@ -96,6 +101,13 @@ describe('DiscussionActions', () => {
     });
   });
 
+  it('does not render jump to next discussion button if feature flag is enabled', () => {
+    const createComponent = createComponentFactory();
+    createComponent({}, { hideJumpToNextUnresolvedInThreads: true });
+
+    expect(wrapper.find(JumpToNextDiscussionButton).exists()).toBe(false);
+  });
+
   describe('events handling', () => {
     const createComponent = createComponentFactory(false);