Apply review comments63200-reply-button-broken

1 files changed, 5 insertions, 7 deletions

diff --git a/spec/frontend/notes/components/discussion_notes_spec.js b/spec/frontend/notes/components/discussion_notes_spec.js
index 964ee7ccb5c..394666403ee 100644
--- a/spec/frontend/notes/components/discussion_notes_spec.js
+++ b/spec/frontend/notes/components/discussion_notes_spec.js
@@ -114,26 +114,24 @@ describe('DiscussionNotes', () => {
 
   describe('events', () => {
     describe('with groupped notes and replies expanded', () => {
-      let firstNote;
-      let secondNote;
+      const findNoteAtIndex = index => wrapper.find(`.note:nth-of-type(${index + 1}`);
+
       beforeEach(() => {
         createComponent({ shouldGroupReplies: true, isExpanded: true });
-        const notes = wrapper.findAll('.note');
-        [firstNote, secondNote] = [notes.at(0), notes.at(1)];
       });
 
       it('emits deleteNote when first note emits handleDeleteNote', () => {
-        firstNote.vm.$emit('handleDeleteNote');
+        findNoteAtIndex(0).vm.$emit('handleDeleteNote');
         expect(wrapper.emitted().deleteNote).toBeTruthy();
       });
 
       it('emits startReplying when first note emits startReplying', () => {
-        firstNote.vm.$emit('startReplying');
+        findNoteAtIndex(0).vm.$emit('startReplying');
         expect(wrapper.emitted().startReplying).toBeTruthy();
       });
 
       it('emits deleteNote when second note emits handleDeleteNote', () => {
-        secondNote.vm.$emit('handleDeleteNote');
+        findNoteAtIndex(1).vm.$emit('handleDeleteNote');
         expect(wrapper.emitted().deleteNote).toBeTruthy();
       });
     });