Add latest changes from gitlab-org/gitlab@master

10 files changed, 24 insertions, 24 deletions

diff --git a/spec/frontend/jobs/components/environments_block_spec.js b/spec/frontend/jobs/components/environments_block_spec.js
index d90c9137a8f..5a2b6988224 100644
--- a/spec/frontend/jobs/components/environments_block_spec.js
+++ b/spec/frontend/jobs/components/environments_block_spec.js
@@ -46,7 +46,7 @@ describe('Environments block', () => {
     });
   };
 
-  const findText = () => wrapper.find(EnvironmentsBlock).text();
+  const findText = () => wrapper.findComponent(EnvironmentsBlock).text();
   const findJobDeploymentLink = () => wrapper.find('[data-testid="job-deployment-link"]');
   const findEnvironmentLink = () => wrapper.find('[data-testid="job-environment-link"]');
   const findClusterLink = () => wrapper.find('[data-testid="job-cluster-link"]');
diff --git a/spec/frontend/jobs/components/erased_block_spec.js b/spec/frontend/jobs/components/erased_block_spec.js
index 057df20ccc2..7b44458c18b 100644
--- a/spec/frontend/jobs/components/erased_block_spec.js
+++ b/spec/frontend/jobs/components/erased_block_spec.js
@@ -10,7 +10,7 @@ describe('Erased block', () => {
   const timeago = getTimeago();
   const formattedDate = timeago.format(erasedAt);
 
-  const findLink = () => wrapper.find(GlLink);
+  const findLink = () => wrapper.findComponent(GlLink);
 
   const createComponent = (props) => {
     wrapper = mount(ErasedBlock, {
diff --git a/spec/frontend/jobs/components/job_app_spec.js b/spec/frontend/jobs/components/job_app_spec.js
index b4b5bc4669d..d028b65f075 100644
--- a/spec/frontend/jobs/components/job_app_spec.js
+++ b/spec/frontend/jobs/components/job_app_spec.js
@@ -57,18 +57,18 @@ describe('Job App', () => {
     await nextTick();
   };
 
-  const findLoadingComponent = () => wrapper.find(GlLoadingIcon);
-  const findSidebar = () => wrapper.find(Sidebar);
+  const findLoadingComponent = () => wrapper.findComponent(GlLoadingIcon);
+  const findSidebar = () => wrapper.findComponent(Sidebar);
   const findJobContent = () => wrapper.find('[data-testid="job-content"');
-  const findStuckBlockComponent = () => wrapper.find(StuckBlock);
+  const findStuckBlockComponent = () => wrapper.findComponent(StuckBlock);
   const findStuckBlockWithTags = () => wrapper.find('[data-testid="job-stuck-with-tags"');
   const findStuckBlockNoActiveRunners = () =>
     wrapper.find('[data-testid="job-stuck-no-active-runners"');
-  const findFailedJobComponent = () => wrapper.find(UnmetPrerequisitesBlock);
-  const findEnvironmentsBlockComponent = () => wrapper.find(EnvironmentsBlock);
-  const findErasedBlock = () => wrapper.find(ErasedBlock);
+  const findFailedJobComponent = () => wrapper.findComponent(UnmetPrerequisitesBlock);
+  const findEnvironmentsBlockComponent = () => wrapper.findComponent(EnvironmentsBlock);
+  const findErasedBlock = () => wrapper.findComponent(ErasedBlock);
   const findArchivedJob = () => wrapper.find('[data-testid="archived-job"]');
-  const findEmptyState = () => wrapper.find(EmptyState);
+  const findEmptyState = () => wrapper.findComponent(EmptyState);
   const findJobNewIssueLink = () => wrapper.find('[data-testid="job-new-issue"]');
   const findJobEmptyStateTitle = () => wrapper.find('[data-testid="job-empty-state-title"]');
   const findJobLogScrollTop = () => wrapper.find('[data-testid="job-controller-scroll-top"]');
diff --git a/spec/frontend/jobs/components/job_retry_forward_deployment_modal_spec.js b/spec/frontend/jobs/components/job_retry_forward_deployment_modal_spec.js
index 08973223c08..fa6a3b5d350 100644
--- a/spec/frontend/jobs/components/job_retry_forward_deployment_modal_spec.js
+++ b/spec/frontend/jobs/components/job_retry_forward_deployment_modal_spec.js
@@ -10,8 +10,8 @@ describe('Job Retry Forward Deployment Modal', () => {
   let wrapper;
 
   const retryOutdatedJobDocsUrl = 'url-to-docs';
-  const findLink = () => wrapper.find(GlLink);
-  const findModal = () => wrapper.find(GlModal);
+  const findLink = () => wrapper.findComponent(GlLink);
+  const findModal = () => wrapper.findComponent(GlModal);
 
   const createWrapper = ({ props = {}, provide = {}, stubs = {} } = {}) => {
     store = createStore();
diff --git a/spec/frontend/jobs/components/job_sidebar_details_container_spec.js b/spec/frontend/jobs/components/job_sidebar_details_container_spec.js
index 4046f0269dd..a398f998dff 100644
--- a/spec/frontend/jobs/components/job_sidebar_details_container_spec.js
+++ b/spec/frontend/jobs/components/job_sidebar_details_container_spec.js
@@ -11,7 +11,7 @@ describe('Job Sidebar Details Container', () => {
 
   const findJobTimeout = () => wrapper.findByTestId('job-timeout');
   const findJobTags = () => wrapper.findByTestId('job-tags');
-  const findAllDetailsRow = () => wrapper.findAll(DetailRow);
+  const findAllDetailsRow = () => wrapper.findAllComponents(DetailRow);
 
   const createWrapper = ({ props = {} } = {}) => {
     store = createStore();
diff --git a/spec/frontend/jobs/components/log/line_header_spec.js b/spec/frontend/jobs/components/log/line_header_spec.js
index bdc8ae0eef0..ec8e79bba13 100644
--- a/spec/frontend/jobs/components/log/line_header_spec.js
+++ b/spec/frontend/jobs/components/log/line_header_spec.js
@@ -39,7 +39,7 @@ describe('Job Log Header Line', () => {
     });
 
     it('renders the line number component', () => {
-      expect(wrapper.find(LineNumber).exists()).toBe(true);
+      expect(wrapper.findComponent(LineNumber).exists()).toBe(true);
     });
 
     it('renders a span the provided text', () => {
@@ -90,7 +90,7 @@ describe('Job Log Header Line', () => {
     });
 
     it('renders the duration badge', () => {
-      expect(wrapper.find(DurationBadge).exists()).toBe(true);
+      expect(wrapper.findComponent(DurationBadge).exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/jobs/components/log/line_spec.js b/spec/frontend/jobs/components/log/line_spec.js
index bf80d90e299..50ebd1610d2 100644
--- a/spec/frontend/jobs/components/log/line_spec.js
+++ b/spec/frontend/jobs/components/log/line_spec.js
@@ -42,7 +42,7 @@ describe('Job Log Line', () => {
   });
 
   it('renders the line number component', () => {
-    expect(wrapper.find(LineNumber).exists()).toBe(true);
+    expect(wrapper.findComponent(LineNumber).exists()).toBe(true);
   });
 
   it('renders a span the provided text', () => {
diff --git a/spec/frontend/jobs/components/sidebar_spec.js b/spec/frontend/jobs/components/sidebar_spec.js
index 39c71986ce4..9a4720bf97b 100644
--- a/spec/frontend/jobs/components/sidebar_spec.js
+++ b/spec/frontend/jobs/components/sidebar_spec.js
@@ -15,11 +15,11 @@ describe('Sidebar details block', () => {
   let wrapper;
 
   const forwardDeploymentFailure = 'forward_deployment_failure';
-  const findModal = () => wrapper.find(JobRetryForwardDeploymentModal);
+  const findModal = () => wrapper.findComponent(JobRetryForwardDeploymentModal);
   const findArtifactsBlock = () => wrapper.findComponent(ArtifactsBlock);
   const findCancelButton = () => wrapper.findByTestId('cancel-button');
   const findNewIssueButton = () => wrapper.findByTestId('job-new-issue');
-  const findRetryButton = () => wrapper.find(JobRetryButton);
+  const findRetryButton = () => wrapper.findComponent(JobRetryButton);
   const findTerminalLink = () => wrapper.findByTestId('terminal-link');
   const findEraseLink = () => wrapper.findByTestId('job-log-erase-link');
 
@@ -176,7 +176,7 @@ describe('Sidebar details block', () => {
 
     describe('with stages', () => {
       it('renders value provided as selectedStage as selected', () => {
-        expect(wrapper.find(StagesDropdown).props('selectedStage')).toBe('aStage');
+        expect(wrapper.findComponent(StagesDropdown).props('selectedStage')).toBe('aStage');
       });
     });
 
@@ -184,7 +184,7 @@ describe('Sidebar details block', () => {
       beforeEach(() => store.dispatch('receiveJobSuccess', job));
 
       it('does not render jobs container', () => {
-        expect(wrapper.find(JobsContainer).exists()).toBe(false);
+        expect(wrapper.findComponent(JobsContainer).exists()).toBe(false);
       });
     });
 
@@ -195,7 +195,7 @@ describe('Sidebar details block', () => {
       });
 
       it('renders list of jobs', () => {
-        expect(wrapper.find(JobsContainer).exists()).toBe(true);
+        expect(wrapper.findComponent(JobsContainer).exists()).toBe(true);
       });
     });
   });
diff --git a/spec/frontend/jobs/components/stuck_block_spec.js b/spec/frontend/jobs/components/stuck_block_spec.js
index 1580ed45e46..119255cc1e9 100644
--- a/spec/frontend/jobs/components/stuck_block_spec.js
+++ b/spec/frontend/jobs/components/stuck_block_spec.js
@@ -26,8 +26,8 @@ describe('Stuck Block Job component', () => {
     wrapper.find('[data-testid="job-stuck-no-active-runners"]');
   const findStuckNoRunners = () => wrapper.find('[data-testid="job-stuck-no-runners"]');
   const findStuckWithTags = () => wrapper.find('[data-testid="job-stuck-with-tags"]');
-  const findRunnerPathLink = () => wrapper.find(GlLink);
-  const findAllBadges = () => wrapper.findAll(GlBadge);
+  const findRunnerPathLink = () => wrapper.findComponent(GlLink);
+  const findAllBadges = () => wrapper.findAllComponents(GlBadge);
 
   describe('with no runners for project', () => {
     beforeEach(() => {
diff --git a/spec/frontend/jobs/components/unmet_prerequisites_block_spec.js b/spec/frontend/jobs/components/unmet_prerequisites_block_spec.js
index aeb85694e60..d1dbd65bd17 100644
--- a/spec/frontend/jobs/components/unmet_prerequisites_block_spec.js
+++ b/spec/frontend/jobs/components/unmet_prerequisites_block_spec.js
@@ -23,7 +23,7 @@ describe('Unmet Prerequisites Block Job component', () => {
   });
 
   it('renders an alert with the correct message', () => {
-    const container = wrapper.find(GlAlert);
+    const container = wrapper.findComponent(GlAlert);
     const alertMessage =
       'This job failed because the necessary resources were not successfully created.';
 
@@ -32,7 +32,7 @@ describe('Unmet Prerequisites Block Job component', () => {
   });
 
   it('renders link to help page', () => {
-    const helpLink = wrapper.find(GlLink);
+    const helpLink = wrapper.findComponent(GlLink);
 
     expect(helpLink).not.toBeNull();
     expect(helpLink.text()).toContain('More information');