Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 5 deletions

diff --git a/spec/frontend/releases/components/app_index_apollo_client_spec.js b/spec/frontend/releases/components/app_index_apollo_client_spec.js
index 32bbfd386f5..53ee5b223ad 100644
--- a/spec/frontend/releases/components/app_index_apollo_client_spec.js
+++ b/spec/frontend/releases/components/app_index_apollo_client_spec.js
@@ -4,6 +4,7 @@ import VueApollo from 'vue-apollo';
 import originalAllReleasesQueryResponse from 'test_fixtures/graphql/releases/graphql/queries/all_releases.query.graphql.json';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import waitForPromises from 'helpers/wait_for_promises';
 import allReleasesQuery from 'shared_queries/releases/all_releases.query.graphql';
 import createFlash from '~/flash';
 import { historyPushState } from '~/lib/utils/common_utils';
@@ -141,7 +142,8 @@ describe('app_index_apollo_client.vue', () => {
           });
         });
 
-        it(`${toDescription(loadingIndicator)} render a loading indicator`, () => {
+        it(`${toDescription(loadingIndicator)} render a loading indicator`, async () => {
+          await waitForPromises();
           expect(findLoadingIndicator().exists()).toBe(loadingIndicator);
         });
 
diff --git a/spec/frontend/releases/components/app_show_spec.js b/spec/frontend/releases/components/app_show_spec.js
index a60b9bda66a..41c9746a363 100644
--- a/spec/frontend/releases/components/app_show_spec.js
+++ b/spec/frontend/releases/components/app_show_spec.js
@@ -3,6 +3,7 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import oneReleaseQueryResponse from 'test_fixtures/graphql/releases/graphql/queries/one_release.query.graphql.json';
 import createMockApollo from 'helpers/mock_apollo_helper';
+import waitForPromises from 'helpers/wait_for_promises';
 import createFlash from '~/flash';
 import ReleaseShowApp from '~/releases/components/app_show.vue';
 import ReleaseBlock from '~/releases/components/release_block.vue';
@@ -111,12 +112,13 @@ describe('Release show component', () => {
   });
 
   describe('when the component has successfully loaded the release', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       const apolloProvider = createMockApollo([
         [oneReleaseQuery, jest.fn().mockResolvedValueOnce(oneReleaseQueryResponse)],
       ]);
 
       createComponent({ apolloProvider });
+      await waitForPromises();
     });
 
     expectNoLoadingIndicator();
@@ -125,12 +127,13 @@ describe('Release show component', () => {
   });
 
   describe('when the request succeeded, but the returned "project" key was null', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       const apolloProvider = createMockApollo([
         [oneReleaseQuery, jest.fn().mockResolvedValueOnce({ data: { project: null } })],
       ]);
 
       createComponent({ apolloProvider });
+      await waitForPromises();
     });
 
     expectNoLoadingIndicator();
@@ -139,7 +142,7 @@ describe('Release show component', () => {
   });
 
   describe('when the request succeeded, but the returned "project.release" key was null', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       const apolloProvider = createMockApollo([
         [
           oneReleaseQuery,
@@ -148,6 +151,7 @@ describe('Release show component', () => {
       ]);
 
       createComponent({ apolloProvider });
+      await waitForPromises();
     });
 
     expectNoLoadingIndicator();
@@ -156,12 +160,13 @@ describe('Release show component', () => {
   });
 
   describe('when an error occurs while loading the release', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       const apolloProvider = createMockApollo([
         [oneReleaseQuery, jest.fn().mockRejectedValueOnce('An error occurred!')],
       ]);
 
       createComponent({ apolloProvider });
+      await waitForPromises();
     });
 
     expectNoLoadingIndicator();