Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 2 deletions

diff --git a/spec/frontend/notes/components/noteable_discussion_spec.js b/spec/frontend/notes/components/noteable_discussion_spec.js
index 0ed7069a98d..fa3a1979a98 100644
--- a/spec/frontend/notes/components/noteable_discussion_spec.js
+++ b/spec/frontend/notes/components/noteable_discussion_spec.js
@@ -49,14 +49,14 @@ describe('noteable_discussion component', () => {
     });
   };
 
-  const createComponent = ({ storeMock = createStore() } = {}) => {
+  const createComponent = ({ storeMock = createStore(), discussion = discussionMock } = {}) => {
     store = storeMock;
     store.dispatch('setNoteableData', noteableDataMock);
     store.dispatch('setNotesData', notesDataMock);
 
     wrapper = mountExtended(NoteableDiscussion, {
       store,
-      propsData: { discussion: discussionMock },
+      propsData: { discussion },
     });
   };
 
@@ -160,6 +160,23 @@ describe('noteable_discussion component', () => {
         false,
       );
     });
+
+    it('should add `internal-note` class when the discussion is internal', async () => {
+      const softCopyInternalNotes = [...discussionMock.notes];
+      const mockInternalNotes = softCopyInternalNotes.splice(0, 2);
+      mockInternalNotes[0].internal = true;
+
+      const mockDiscussion = {
+        ...discussionMock,
+        notes: [...mockInternalNotes],
+      };
+      wrapper.setProps({ discussion: mockDiscussion });
+      await nextTick();
+
+      const replyWrapper = wrapper.find('[data-testid="reply-wrapper"]');
+      expect(replyWrapper.exists()).toBe(true);
+      expect(replyWrapper.classes('internal-note')).toBe(true);
+    });
   });
 
   describe('for resolved thread', () => {