Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

4 files changed, 64 insertions, 23 deletions

diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js
index b140eea9439..537622b7918 100644
--- a/spec/frontend/notes/components/comment_form_spec.js
+++ b/spec/frontend/notes/components/comment_form_spec.js
@@ -328,20 +328,45 @@ describe('issue_comment_form component', () => {
           mountComponent({ mountFunction: mount });
         });
 
-        it('should save note when cmd+enter is pressed', () => {
-          jest.spyOn(wrapper.vm, 'handleSave');
+        describe('when no draft exists', () => {
+          it('should save note when cmd+enter is pressed', () => {
+            jest.spyOn(wrapper.vm, 'handleSave');
 
-          findTextArea().trigger('keydown.enter', { metaKey: true });
+            findTextArea().trigger('keydown.enter', { metaKey: true });
 
-          expect(wrapper.vm.handleSave).toHaveBeenCalled();
+            expect(wrapper.vm.handleSave).toHaveBeenCalledWith();
+          });
+
+          it('should save note when ctrl+enter is pressed', () => {
+            jest.spyOn(wrapper.vm, 'handleSave');
+
+            findTextArea().trigger('keydown.enter', { ctrlKey: true });
+
+            expect(wrapper.vm.handleSave).toHaveBeenCalledWith();
+          });
         });
 
-        it('should save note when ctrl+enter is pressed', () => {
-          jest.spyOn(wrapper.vm, 'handleSave');
+        describe('when a draft exists', () => {
+          beforeEach(() => {
+            store.registerModule('batchComments', batchComments());
+            store.state.batchComments.drafts = [{ note: 'A' }];
+          });
+
+          it('should save note draft when cmd+enter is pressed', () => {
+            jest.spyOn(wrapper.vm, 'handleSaveDraft');
+
+            findTextArea().trigger('keydown.enter', { metaKey: true });
+
+            expect(wrapper.vm.handleSaveDraft).toHaveBeenCalledWith();
+          });
+
+          it('should save note draft when ctrl+enter is pressed', () => {
+            jest.spyOn(wrapper.vm, 'handleSaveDraft');
 
-          findTextArea().trigger('keydown.enter', { ctrlKey: true });
+            findTextArea().trigger('keydown.enter', { ctrlKey: true });
 
-          expect(wrapper.vm.handleSave).toHaveBeenCalled();
+            expect(wrapper.vm.handleSaveDraft).toHaveBeenCalledWith();
+          });
         });
       });
     });
diff --git a/spec/frontend/notes/components/discussion_actions_spec.js b/spec/frontend/notes/components/discussion_actions_spec.js
index c6a7d7ead98..925dbcc09ec 100644
--- a/spec/frontend/notes/components/discussion_actions_spec.js
+++ b/spec/frontend/notes/components/discussion_actions_spec.js
@@ -20,7 +20,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;
 
@@ -34,6 +34,7 @@ describe('DiscussionActions', () => {
         shouldShowJumpToNextDiscussion: true,
         ...props,
       },
+      ...options,
     });
   };
 
@@ -90,17 +91,17 @@ describe('DiscussionActions', () => {
   describe('events handling', () => {
     const createComponent = createComponentFactory(false);
 
-    beforeEach(() => {
-      createComponent();
-    });
-
     it('emits showReplyForm event when clicking on reply placeholder', () => {
+      createComponent({}, { attachTo: document.body });
+
       jest.spyOn(wrapper.vm, '$emit');
       wrapper.find(ReplyPlaceholder).find('textarea').trigger('focus');
       expect(wrapper.vm.$emit).toHaveBeenCalledWith('showReplyForm');
     });
 
     it('emits resolve event when clicking on resolve button', () => {
+      createComponent();
+
       jest.spyOn(wrapper.vm, '$emit');
       wrapper.find(ResolveDiscussionButton).find('button').trigger('click');
       expect(wrapper.vm.$emit).toHaveBeenCalledWith('resolve');
diff --git a/spec/frontend/notes/components/discussion_reply_placeholder_spec.js b/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
index 2a4cd0df0c7..3932f818c4e 100644
--- a/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
+++ b/spec/frontend/notes/components/discussion_reply_placeholder_spec.js
@@ -6,31 +6,34 @@ const placeholderText = 'Test Button Text';
 describe('ReplyPlaceholder', () => {
   let wrapper;
 
-  const findTextarea = () => wrapper.find({ ref: 'textarea' });
-
-  beforeEach(() => {
+  const createComponent = ({ options = {} } = {}) => {
     wrapper = shallowMount(ReplyPlaceholder, {
       propsData: {
         placeholderText,
       },
+      ...options,
     });
-  });
+  };
+
+  const findTextarea = () => wrapper.find({ ref: 'textarea' });
 
   afterEach(() => {
     wrapper.destroy();
   });
 
-  it('emits focus event on button click', () => {
-    findTextarea().trigger('focus');
+  it('emits focus event on button click', async () => {
+    createComponent({ options: { attachTo: document.body } });
+
+    await findTextarea().trigger('focus');
 
-    return wrapper.vm.$nextTick().then(() => {
-      expect(wrapper.emitted()).toEqual({
-        focus: [[]],
-      });
+    expect(wrapper.emitted()).toEqual({
+      focus: [[]],
     });
   });
 
   it('should render reply button', () => {
+    createComponent();
+
     expect(findTextarea().attributes('placeholder')).toEqual(placeholderText);
   });
 });
diff --git a/spec/frontend/notes/components/noteable_discussion_spec.js b/spec/frontend/notes/components/noteable_discussion_spec.js
index 735bc2b70dd..a364a524e7b 100644
--- a/spec/frontend/notes/components/noteable_discussion_spec.js
+++ b/spec/frontend/notes/components/noteable_discussion_spec.js
@@ -56,6 +56,18 @@ describe('noteable_discussion component', () => {
     expect(wrapper.find('.discussion-header').exists()).toBe(true);
   });
 
+  it('should hide actions when diff refs do not exists', async () => {
+    const discussion = { ...discussionMock };
+    discussion.diff_file = { ...mockDiffFile, diff_refs: null };
+    discussion.diff_discussion = true;
+    discussion.expanded = false;
+
+    wrapper.setProps({ discussion });
+    await nextTick();
+
+    expect(wrapper.vm.canShowReplyActions).toBe(false);
+  });
+
   describe('actions', () => {
     it('should toggle reply form', async () => {
       await nextTick();