Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 9 deletions

diff --git a/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_modal_spec.js b/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_modal_spec.js
index e74a867ec97..7808bdb8db3 100644
--- a/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_modal_spec.js
+++ b/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_modal_spec.js
@@ -77,8 +77,6 @@ describe('RunnerInstructionsModal component', () => {
     runnerSetupInstructionsHandler = jest.fn().mockResolvedValue(mockGraphqlInstructions);
 
     createComponent();
-
-    await nextTick();
   });
 
   afterEach(() => {
@@ -113,13 +111,15 @@ describe('RunnerInstructionsModal component', () => {
       });
     });
 
-    it('binary instructions are shown', () => {
+    it('binary instructions are shown', async () => {
+      await waitForPromises();
       const instructions = findBinaryInstructions().text();
 
       expect(instructions).toBe(installInstructions);
     });
 
-    it('register command is shown with a replaced token', () => {
+    it('register command is shown with a replaced token', async () => {
+      await waitForPromises();
       const instructions = findRegisterCommand().text();
 
       expect(instructions).toBe(
@@ -130,7 +130,7 @@ describe('RunnerInstructionsModal component', () => {
     describe('when a register token is not shown', () => {
       beforeEach(async () => {
         createComponent({ props: { registrationToken: undefined } });
-        await nextTick();
+        await waitForPromises();
       });
 
       it('register command is shown without a defined registration token', () => {
@@ -198,16 +198,16 @@ describe('RunnerInstructionsModal component', () => {
       expect(findSkeletonLoader().exists()).toBe(true);
       expect(findGlLoadingIcon().exists()).toBe(false);
 
-      await nextTick(); // wait for platforms
+      await nextTick();
+      await jest.runOnlyPendingTimers();
+      await nextTick();
 
       expect(findGlLoadingIcon().exists()).toBe(true);
     });
 
     it('once loaded, should not show a loading state', async () => {
       createComponent();
-
-      await nextTick(); // wait for platforms
-      await nextTick(); // wait for architectures
+      await waitForPromises();
 
       expect(findSkeletonLoader().exists()).toBe(false);
       expect(findGlLoadingIcon().exists()).toBe(false);