Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 29 deletions

diff --git a/spec/frontend/notes/components/notes_app_spec.js b/spec/frontend/notes/components/notes_app_spec.js
index acd27dab4eb..36a68118fa7 100644
--- a/spec/frontend/notes/components/notes_app_spec.js
+++ b/spec/frontend/notes/components/notes_app_spec.js
@@ -44,22 +44,6 @@ describe('note_app', () => {
       .wrappers.map((node) => (node.is(CommentForm) ? TYPE_COMMENT_FORM : TYPE_NOTES_LIST));
   };
 
-  /**
-   * waits for fetchNotes() to complete
-   */
-  const waitForDiscussionsRequest = () =>
-    new Promise((resolve) => {
-      const { vm } = wrapper.find(NotesApp);
-      const unwatch = vm.$watch('isFetching', (isFetching) => {
-        if (isFetching) {
-          return;
-        }
-
-        unwatch();
-        resolve();
-      });
-    });
-
   beforeEach(() => {
     $('body').attr('data-page', 'projects:merge_requests:show');
 
@@ -95,7 +79,7 @@ describe('note_app', () => {
 
       axiosMock.onAny().reply(200, []);
       wrapper = mountComponent();
-      return waitForDiscussionsRequest();
+      return waitForPromises();
     });
 
     afterEach(() => {
@@ -129,7 +113,7 @@ describe('note_app', () => {
 
       axiosMock.onAny().reply(mockData.getIndividualNoteResponse);
       wrapper = mountComponent();
-      return waitForDiscussionsRequest();
+      return waitForPromises();
     });
 
     afterEach(() => {
@@ -172,7 +156,7 @@ describe('note_app', () => {
       axiosMock.onAny().reply(mockData.getIndividualNoteResponse);
       store.state.commentsDisabled = true;
       wrapper = mountComponent();
-      return waitForDiscussionsRequest();
+      return waitForPromises();
     });
 
     afterEach(() => {
@@ -197,7 +181,7 @@ describe('note_app', () => {
       store.state.isTimelineEnabled = true;
 
       wrapper = mountComponent();
-      return waitForDiscussionsRequest();
+      return waitForPromises();
     });
 
     afterEach(() => {
@@ -210,14 +194,13 @@ describe('note_app', () => {
   });
 
   describe('while fetching data', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       setHTMLFixture('<div class="js-discussions-count"></div>');
-      axiosMock.onAny().reply(200, []);
       wrapper = mountComponent();
     });
 
     afterEach(() => {
-      return waitForDiscussionsRequest().then(() => resetHTMLFixture());
+      return waitForPromises().then(() => resetHTMLFixture());
     });
 
     it('renders skeleton notes', () => {
@@ -241,7 +224,7 @@ describe('note_app', () => {
       beforeEach(() => {
         axiosMock.onAny().reply(mockData.getIndividualNoteResponse);
         wrapper = mountComponent();
-        return waitForDiscussionsRequest().then(() => {
+        return waitForPromises().then(() => {
           wrapper.find('.js-note-edit').trigger('click');
         });
       });
@@ -263,7 +246,7 @@ describe('note_app', () => {
       beforeEach(() => {
         axiosMock.onAny().reply(mockData.getDiscussionNoteResponse);
         wrapper = mountComponent();
-        return waitForDiscussionsRequest().then(() => {
+        return waitForPromises().then(() => {
           wrapper.find('.js-note-edit').trigger('click');
         });
       });
@@ -286,7 +269,7 @@ describe('note_app', () => {
     beforeEach(() => {
       axiosMock.onAny().reply(mockData.getIndividualNoteResponse);
       wrapper = mountComponent();
-      return waitForDiscussionsRequest();
+      return waitForPromises();
     });
 
     it('should render markdown docs url', () => {
@@ -308,7 +291,7 @@ describe('note_app', () => {
     beforeEach(() => {
       axiosMock.onAny().reply(mockData.getIndividualNoteResponse);
       wrapper = mountComponent();
-      return waitForDiscussionsRequest();
+      return waitForPromises();
     });
 
     it('should render markdown docs url', async () => {
@@ -336,7 +319,7 @@ describe('note_app', () => {
     beforeEach(() => {
       axiosMock.onAny().reply(200, []);
       wrapper = mountComponent();
-      return waitForDiscussionsRequest();
+      return waitForPromises();
     });
 
     it('dispatches toggleAward after toggleAward event', () => {
@@ -372,7 +355,7 @@ describe('note_app', () => {
     beforeEach(() => {
       axiosMock.onAny().reply(mockData.getIndividualNoteResponse);
       wrapper = mountComponent();
-      return waitForDiscussionsRequest();
+      return waitForPromises();
     });
 
     it('should listen hashchange event', () => {