Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/spec/frontend/notes/components/discussion_notes_spec.js b/spec/frontend/notes/components/discussion_notes_spec.js
index 1b8b6bec490..a74d709ed3a 100644
--- a/spec/frontend/notes/components/discussion_notes_spec.js
+++ b/spec/frontend/notes/components/discussion_notes_spec.js
@@ -140,21 +140,21 @@ describe('DiscussionNotes', () => {
         findNoteAtIndex(0).vm.$emit('handleDeleteNote');
 
         await nextTick();
-        expect(wrapper.emitted().deleteNote).toBeTruthy();
+        expect(wrapper.emitted().deleteNote).toHaveLength(1);
       });
 
       it('emits startReplying when first note emits startReplying', async () => {
         findNoteAtIndex(0).vm.$emit('startReplying');
 
         await nextTick();
-        expect(wrapper.emitted().startReplying).toBeTruthy();
+        expect(wrapper.emitted().startReplying).toHaveLength(1);
       });
 
       it('emits deleteNote when second note emits handleDeleteNote', async () => {
         findNoteAtIndex(1).vm.$emit('handleDeleteNote');
 
         await nextTick();
-        expect(wrapper.emitted().deleteNote).toBeTruthy();
+        expect(wrapper.emitted().deleteNote).toHaveLength(1);
       });
     });
 
@@ -169,7 +169,7 @@ describe('DiscussionNotes', () => {
         note.vm.$emit('handleDeleteNote');
 
         await nextTick();
-        expect(wrapper.emitted().deleteNote).toBeTruthy();
+        expect(wrapper.emitted().deleteNote).toHaveLength(1);
       });
     });
   });
diff --git a/spec/frontend/notes/components/multiline_comment_form_spec.js b/spec/frontend/notes/components/multiline_comment_form_spec.js
index b027a261c15..8446bba340f 100644
--- a/spec/frontend/notes/components/multiline_comment_form_spec.js
+++ b/spec/frontend/notes/components/multiline_comment_form_spec.js
@@ -70,7 +70,7 @@ describe('MultilineCommentForm', () => {
     glSelect.vm.$emit('change', { ...testLine });
 
     expect(wrapper.vm.commentLineStart).toEqual(line);
-    expect(wrapper.emitted('input')).toBeTruthy();
+    expect(wrapper.emitted('input')).toHaveLength(1);
     // Once during created, once during updateCommentLineStart
     expect(setSelectedCommentPosition).toHaveBeenCalledTimes(2);
   });