Add latest changes from gitlab-org/gitlab@master

8 files changed, 17 insertions, 17 deletions

diff --git a/spec/frontend/pipelines/graph/action_component_spec.js b/spec/frontend/pipelines/graph/action_component_spec.js
index 6e5aa572ec0..a823e029281 100644
--- a/spec/frontend/pipelines/graph/action_component_spec.js
+++ b/spec/frontend/pipelines/graph/action_component_spec.js
@@ -9,7 +9,7 @@ import ActionComponent from '~/pipelines/components/jobs_shared/action_component
 describe('pipeline graph action component', () => {
   let wrapper;
   let mock;
-  const findButton = () => wrapper.find(GlButton);
+  const findButton = () => wrapper.findComponent(GlButton);
   const findTooltipWrapper = () => wrapper.find('[data-testid="ci-action-icon-tooltip-wrapper"]');
 
   beforeEach(() => {
diff --git a/spec/frontend/pipelines/graph/graph_component_spec.js b/spec/frontend/pipelines/graph/graph_component_spec.js
index 4b2b61c8edd..3ab58882786 100644
--- a/spec/frontend/pipelines/graph/graph_component_spec.js
+++ b/spec/frontend/pipelines/graph/graph_component_spec.js
@@ -16,7 +16,7 @@ describe('graph component', () => {
   let wrapper;
 
   const findLinkedColumns = () => wrapper.findAll(LinkedPipelinesColumn);
-  const findLinksLayer = () => wrapper.find(LinksLayer);
+  const findLinksLayer = () => wrapper.findComponent(LinksLayer);
   const findStageColumns = () => wrapper.findAll(StageColumnComponent);
   const findStageNameInJob = () => wrapper.find('[data-testid="stage-name-in-job"]');
 
@@ -107,7 +107,7 @@ describe('graph component', () => {
       });
 
       it('dims unrelated jobs', () => {
-        const unrelatedJob = wrapper.find(JobItem);
+        const unrelatedJob = wrapper.findComponent(JobItem);
         expect(findLinksLayer().emitted().highlightedJobsChange).toHaveLength(1);
         expect(unrelatedJob.classes('gl-opacity-3')).toBe(true);
       });
diff --git a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
index 454b3814d8c..a2097dda860 100644
--- a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
+++ b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js
@@ -51,11 +51,11 @@ describe('Pipeline graph wrapper', () => {
   const getDependenciesToggle = () => wrapper.find('[data-testid="show-links-toggle"]');
   const getLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
   const getLinksLayer = () => wrapper.findComponent(LinksLayer);
-  const getGraph = () => wrapper.find(PipelineGraph);
+  const getGraph = () => wrapper.findComponent(PipelineGraph);
   const getStageColumnTitle = () => wrapper.find('[data-testid="stage-column-title"]');
   const getAllStageColumnGroupsInColumn = () =>
-    wrapper.find(StageColumnComponent).findAll('[data-testid="stage-column-group"]');
-  const getViewSelector = () => wrapper.find(GraphViewSelector);
+    wrapper.findComponent(StageColumnComponent).findAll('[data-testid="stage-column-group"]');
+  const getViewSelector = () => wrapper.findComponent(GraphViewSelector);
   const getViewSelectorTrip = () => getViewSelector().findComponent(GlAlert);
   const getLocalStorageSync = () => wrapper.findComponent(LocalStorageSync);
 
@@ -408,7 +408,7 @@ describe('Pipeline graph wrapper', () => {
 
       it('reads the view type from localStorage when available', () => {
         const viewSelectorNeedsSegment = wrapper
-          .find(GlButtonGroup)
+          .findComponent(GlButtonGroup)
           .findAllComponents(GlButton)
           .at(1);
         expect(viewSelectorNeedsSegment.classes()).toContain('selected');
diff --git a/spec/frontend/pipelines/graph/graph_view_selector_spec.js b/spec/frontend/pipelines/graph/graph_view_selector_spec.js
index 4e79c7e73cc..43587bebedf 100644
--- a/spec/frontend/pipelines/graph/graph_view_selector_spec.js
+++ b/spec/frontend/pipelines/graph/graph_view_selector_spec.js
@@ -11,7 +11,7 @@ describe('the graph view selector component', () => {
   const findStageViewButton = () => findViewTypeSelector().findAllComponents(GlButton).at(0);
   const findLayerViewButton = () => findViewTypeSelector().findAllComponents(GlButton).at(1);
   const findSwitcherLoader = () => wrapper.find('[data-testid="switcher-loading-state"]');
-  const findToggleLoader = () => findDependenciesToggle().find(GlLoadingIcon);
+  const findToggleLoader = () => findDependenciesToggle().findComponent(GlLoadingIcon);
   const findHoverTip = () => wrapper.findComponent(GlAlert);
 
   const defaultProps = {
diff --git a/spec/frontend/pipelines/graph/job_name_component_spec.js b/spec/frontend/pipelines/graph/job_name_component_spec.js
index d3008c046e8..ec432e98fdf 100644
--- a/spec/frontend/pipelines/graph/job_name_component_spec.js
+++ b/spec/frontend/pipelines/graph/job_name_component_spec.js
@@ -24,7 +24,7 @@ describe('job name component', () => {
   });
 
   it('should render an icon with the provided status', () => {
-    expect(wrapper.find(ciIcon).exists()).toBe(true);
+    expect(wrapper.findComponent(ciIcon).exists()).toBe(true);
     expect(wrapper.find('.ci-status-icon-success').exists()).toBe(true);
   });
 });
diff --git a/spec/frontend/pipelines/graph/linked_pipeline_spec.js b/spec/frontend/pipelines/graph/linked_pipeline_spec.js
index 7d1e4774a24..b9244ca0547 100644
--- a/spec/frontend/pipelines/graph/linked_pipeline_spec.js
+++ b/spec/frontend/pipelines/graph/linked_pipeline_spec.js
@@ -36,13 +36,13 @@ describe('Linked pipeline', () => {
     type: UPSTREAM,
   };
 
-  const findButton = () => wrapper.find(GlButton);
+  const findButton = () => wrapper.findComponent(GlButton);
   const findCancelButton = () => wrapper.findByLabelText('Cancel downstream pipeline');
   const findCardTooltip = () => wrapper.findComponent(GlTooltip);
   const findDownstreamPipelineTitle = () => wrapper.findByTestId('downstream-title');
   const findExpandButton = () => wrapper.findByTestId('expand-pipeline-button');
-  const findLinkedPipeline = () => wrapper.find({ ref: 'linkedPipeline' });
-  const findLoadingIcon = () => wrapper.find(GlLoadingIcon);
+  const findLinkedPipeline = () => wrapper.findComponent({ ref: 'linkedPipeline' });
+  const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
   const findPipelineLabel = () => wrapper.findByTestId('downstream-pipeline-label');
   const findPipelineLink = () => wrapper.findByTestId('pipelineLink');
   const findRetryButton = () => wrapper.findByLabelText('Retry downstream pipeline');
@@ -80,7 +80,7 @@ describe('Linked pipeline', () => {
     });
 
     it('should render an svg within the status container', () => {
-      const pipelineStatusElement = wrapper.find(CiStatus);
+      const pipelineStatusElement = wrapper.findComponent(CiStatus);
 
       expect(pipelineStatusElement.find('svg').exists()).toBe(true);
     });
@@ -90,7 +90,7 @@ describe('Linked pipeline', () => {
     });
 
     it('should have a ci-status child component', () => {
-      expect(wrapper.find(CiStatus).exists()).toBe(true);
+      expect(wrapper.findComponent(CiStatus).exists()).toBe(true);
     });
 
     it('should render the pipeline id', () => {
diff --git a/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js b/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js
index 46000711110..50fae3ee495 100644
--- a/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js
+++ b/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js
@@ -39,7 +39,7 @@ describe('Linked Pipelines Column', () => {
   let wrapper;
   const findLinkedColumnTitle = () => wrapper.find('[data-testid="linked-column-title"]');
   const findLinkedPipelineElements = () => wrapper.findAll(LinkedPipeline);
-  const findPipelineGraph = () => wrapper.find(PipelineGraph);
+  const findPipelineGraph = () => wrapper.findComponent(PipelineGraph);
   const findExpandButton = () => wrapper.find('[data-testid="expand-pipeline-button"]');
 
   Vue.use(VueApollo);
diff --git a/spec/frontend/pipelines/graph/stage_column_component_spec.js b/spec/frontend/pipelines/graph/stage_column_component_spec.js
index b081258edc0..19f597a7267 100644
--- a/spec/frontend/pipelines/graph/stage_column_component_spec.js
+++ b/spec/frontend/pipelines/graph/stage_column_component_spec.js
@@ -42,8 +42,8 @@ describe('stage column component', () => {
   const findStageColumnTitle = () => wrapper.find('[data-testid="stage-column-title"]');
   const findStageColumnGroup = () => wrapper.find('[data-testid="stage-column-group"]');
   const findAllStageColumnGroups = () => wrapper.findAll('[data-testid="stage-column-group"]');
-  const findJobItem = () => wrapper.find(JobItem);
-  const findActionComponent = () => wrapper.find(ActionComponent);
+  const findJobItem = () => wrapper.findComponent(JobItem);
+  const findActionComponent = () => wrapper.findComponent(ActionComponent);
 
   const createComponent = ({ method = shallowMount, props = {} } = {}) => {
     wrapper = method(StageColumnComponent, {