Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

6 files changed, 52 insertions, 14 deletions

diff --git a/spec/frontend/notes/components/comment_type_dropdown_spec.js b/spec/frontend/notes/components/comment_type_dropdown_spec.js
index 5e1cb813369..8ac6144e5c8 100644
--- a/spec/frontend/notes/components/comment_type_dropdown_spec.js
+++ b/spec/frontend/notes/components/comment_type_dropdown_spec.js
@@ -47,8 +47,18 @@ describe('CommentTypeDropdown component', () => {
   it('Should emit `change` event when clicking on an alternate dropdown option', () => {
     mountComponent({ props: { noteType: constants.DISCUSSION } });
 
-    findCommentDropdownOption().vm.$emit('click');
-    findDiscussionDropdownOption().vm.$emit('click');
+    const event = {
+      type: 'click',
+      stopPropagation: jest.fn(),
+      preventDefault: jest.fn(),
+    };
+
+    findCommentDropdownOption().vm.$emit('click', event);
+    findDiscussionDropdownOption().vm.$emit('click', event);
+
+    // ensure the native events don't trigger anything
+    expect(event.stopPropagation).toHaveBeenCalledTimes(2);
+    expect(event.preventDefault).toHaveBeenCalledTimes(2);
 
     expect(wrapper.emitted('change')[0]).toEqual([constants.COMMENT]);
     expect(wrapper.emitted('change').length).toEqual(1);
diff --git a/spec/frontend/notes/components/diff_with_note_spec.js b/spec/frontend/notes/components/diff_with_note_spec.js
index e997fc4da50..c352265654b 100644
--- a/spec/frontend/notes/components/diff_with_note_spec.js
+++ b/spec/frontend/notes/components/diff_with_note_spec.js
@@ -1,10 +1,9 @@
 import { shallowMount } from '@vue/test-utils';
+import discussionFixture from 'test_fixtures/merge_requests/diff_discussion.json';
+import imageDiscussionFixture from 'test_fixtures/merge_requests/image_diff_discussion.json';
 import { createStore } from '~/mr_notes/stores';
 import DiffWithNote from '~/notes/components/diff_with_note.vue';
 
-const discussionFixture = 'merge_requests/diff_discussion.json';
-const imageDiscussionFixture = 'merge_requests/image_diff_discussion.json';
-
 describe('diff_with_note', () => {
   let store;
   let wrapper;
@@ -35,7 +34,7 @@ describe('diff_with_note', () => {
 
   describe('text diff', () => {
     beforeEach(() => {
-      const diffDiscussion = getJSONFixture(discussionFixture)[0];
+      const diffDiscussion = discussionFixture[0];
 
       wrapper = shallowMount(DiffWithNote, {
         propsData: {
@@ -75,7 +74,7 @@ describe('diff_with_note', () => {
 
   describe('image diff', () => {
     beforeEach(() => {
-      const imageDiscussion = getJSONFixture(imageDiscussionFixture)[0];
+      const imageDiscussion = imageDiscussionFixture[0];
       wrapper = shallowMount(DiffWithNote, {
         propsData: { discussion: imageDiscussion, diffFile: {} },
         store,
diff --git a/spec/frontend/notes/components/note_form_spec.js b/spec/frontend/notes/components/note_form_spec.js
index 92137d3190f..abc888cd245 100644
--- a/spec/frontend/notes/components/note_form_spec.js
+++ b/spec/frontend/notes/components/note_form_spec.js
@@ -150,6 +150,16 @@ describe('issue_note_form component', () => {
 
           expect(handleFormUpdate.length).toBe(1);
         });
+
+        it('should disable textarea when ctrl+enter is pressed', async () => {
+          textarea.trigger('keydown.enter', { ctrlKey: true });
+
+          expect(textarea.attributes('disabled')).toBeUndefined();
+
+          await nextTick();
+
+          expect(textarea.attributes('disabled')).toBe('disabled');
+        });
       });
     });
 
diff --git a/spec/frontend/notes/components/noteable_discussion_spec.js b/spec/frontend/notes/components/noteable_discussion_spec.js
index a364a524e7b..727ef02dcbb 100644
--- a/spec/frontend/notes/components/noteable_discussion_spec.js
+++ b/spec/frontend/notes/components/noteable_discussion_spec.js
@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils';
 import { nextTick } from 'vue';
+import discussionWithTwoUnresolvedNotes from 'test_fixtures/merge_requests/resolved_diff_discussion.json';
 import { trimText } from 'helpers/text_helper';
 import mockDiffFile from 'jest/diffs/mock_data/diff_file';
 import DiscussionNotes from '~/notes/components/discussion_notes.vue';
@@ -17,8 +18,6 @@ import {
   userDataMock,
 } from '../mock_data';
 
-const discussionWithTwoUnresolvedNotes = 'merge_requests/resolved_diff_discussion.json';
-
 describe('noteable_discussion component', () => {
   let store;
   let wrapper;
@@ -119,7 +118,7 @@ describe('noteable_discussion component', () => {
 
   describe('for resolved thread', () => {
     beforeEach(() => {
-      const discussion = getJSONFixture(discussionWithTwoUnresolvedNotes)[0];
+      const discussion = discussionWithTwoUnresolvedNotes[0];
       wrapper.setProps({ discussion });
     });
 
@@ -133,7 +132,7 @@ describe('noteable_discussion component', () => {
   describe('for unresolved thread', () => {
     beforeEach(() => {
       const discussion = {
-        ...getJSONFixture(discussionWithTwoUnresolvedNotes)[0],
+        ...discussionWithTwoUnresolvedNotes[0],
         expanded: true,
       };
       discussion.resolved = false;
diff --git a/spec/frontend/notes/components/noteable_note_spec.js b/spec/frontend/notes/components/noteable_note_spec.js
index 467a8bec21b..038aff3be04 100644
--- a/spec/frontend/notes/components/noteable_note_spec.js
+++ b/spec/frontend/notes/components/noteable_note_spec.js
@@ -189,6 +189,27 @@ describe('issue_note', () => {
       createWrapper();
     });
 
+    describe('avatar sizes in diffs', () => {
+      const line = {
+        line_code: 'abc_1_1',
+        type: null,
+        old_line: '1',
+        new_line: '1',
+      };
+
+      it('should render 24px avatars', async () => {
+        wrapper.setProps({
+          note: { ...note },
+          discussionRoot: true,
+          line,
+        });
+
+        await wrapper.vm.$nextTick();
+
+        expect(wrapper.findComponent(UserAvatarLink).props('imgSize')).toBe(24);
+      });
+    });
+
     it('should render user information', () => {
       const { author } = note;
       const avatar = wrapper.findComponent(UserAvatarLink);
diff --git a/spec/frontend/notes/stores/getters_spec.js b/spec/frontend/notes/stores/getters_spec.js
index 3adb5da020e..9a11fdba508 100644
--- a/spec/frontend/notes/stores/getters_spec.js
+++ b/spec/frontend/notes/stores/getters_spec.js
@@ -1,3 +1,4 @@
+import discussionWithTwoUnresolvedNotes from 'test_fixtures/merge_requests/resolved_diff_discussion.json';
 import { DESC, ASC } from '~/notes/constants';
 import * as getters from '~/notes/stores/getters';
 import {
@@ -17,8 +18,6 @@ import {
   draftDiffDiscussion,
 } from '../mock_data';
 
-const discussionWithTwoUnresolvedNotes = 'merge_requests/resolved_diff_discussion.json';
-
 // Helper function to ensure that we're using the same schema across tests.
 const createDiscussionNeighborParams = (discussionId, diffOrder, step) => ({
   discussionId,
@@ -123,7 +122,7 @@ describe('Getters Notes Store', () => {
 
   describe('resolvedDiscussionsById', () => {
     it('ignores unresolved system notes', () => {
-      const [discussion] = getJSONFixture(discussionWithTwoUnresolvedNotes);
+      const [discussion] = discussionWithTwoUnresolvedNotes;
       discussion.notes[0].resolved = true;
       discussion.notes[1].resolved = false;
       state.discussions.push(discussion);