Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 6 deletions

diff --git a/spec/frontend/pipelines/components/jobs/failed_jobs_app_spec.js b/spec/frontend/pipelines/components/jobs/failed_jobs_app_spec.js
index 3b5632a8a4e..bfbb5f934b9 100644
--- a/spec/frontend/pipelines/components/jobs/failed_jobs_app_spec.js
+++ b/spec/frontend/pipelines/components/jobs/failed_jobs_app_spec.js
@@ -49,15 +49,15 @@ describe('Failed Jobs App', () => {
   });
 
   describe('loading spinner', () => {
-    beforeEach(() => {
+    it('displays loading spinner when fetching failed jobs', () => {
       createComponent(resolverSpy);
-    });
 
-    it('displays loading spinner when fetching failed jobs', () => {
       expect(findLoadingSpinner().exists()).toBe(true);
     });
 
     it('hides loading spinner after the failed jobs have been fetched', async () => {
+      createComponent(resolverSpy);
+
       await waitForPromises();
 
       expect(findLoadingSpinner().exists()).toBe(false);
diff --git a/spec/frontend/pipelines/components/jobs/jobs_app_spec.js b/spec/frontend/pipelines/components/jobs/jobs_app_spec.js
index 81e19a6c221..89b6f764b2f 100644
--- a/spec/frontend/pipelines/components/jobs/jobs_app_spec.js
+++ b/spec/frontend/pipelines/components/jobs/jobs_app_spec.js
@@ -50,20 +50,23 @@ describe('Jobs app', () => {
   });
 
   describe('loading spinner', () => {
-    beforeEach(async () => {
+    const setup = async () => {
       createComponent(resolverSpy);
 
       await waitForPromises();
 
       triggerInfiniteScroll();
-    });
+    };
+
+    it('displays loading spinner when fetching more jobs', async () => {
+      await setup();
 
-    it('displays loading spinner when fetching more jobs', () => {
       expect(findLoadingSpinner().exists()).toBe(true);
       expect(findSkeletonLoader().exists()).toBe(false);
     });
 
     it('hides loading spinner after jobs have been fetched', async () => {
+      await setup();
       await waitForPromises();
 
       expect(findLoadingSpinner().exists()).toBe(false);