Add latest changes from gitlab-org/gitlab@master

5 files changed, 7 insertions, 7 deletions

diff --git a/spec/frontend/clusters_list/components/agent_table_spec.js b/spec/frontend/clusters_list/components/agent_table_spec.js
index b78f0a3686c..9cbb83eedd2 100644
--- a/spec/frontend/clusters_list/components/agent_table_spec.js
+++ b/spec/frontend/clusters_list/components/agent_table_spec.js
@@ -36,7 +36,7 @@ describe('AgentTable', () => {
 
   const findAgentLink = (at) => wrapper.findAllByTestId('cluster-agent-name-link').at(at);
   const findStatusText = (at) => wrapper.findAllByTestId('cluster-agent-connection-status').at(at);
-  const findStatusIcon = (at) => findStatusText(at).find(GlIcon);
+  const findStatusIcon = (at) => findStatusText(at).findComponent(GlIcon);
   const findLastContactText = (at) => wrapper.findAllByTestId('cluster-agent-last-contact').at(at);
   const findVersionText = (at) => wrapper.findAllByTestId('cluster-agent-version').at(at);
   const findConfiguration = (at) =>
@@ -113,7 +113,7 @@ describe('AgentTable', () => {
         texts,
         lineNumber,
       }) => {
-        const findIcon = () => findVersionText(lineNumber).find(GlIcon);
+        const findIcon = () => findVersionText(lineNumber).findComponent(GlIcon);
         const findPopover = () => wrapper.findByTestId(`popover-${agent}`);
         const versionWarning = versionMismatch || versionOutdated;
 
@@ -151,7 +151,7 @@ describe('AgentTable', () => {
     `(
       'displays config file path as "$agentPath" at line $lineNumber',
       ({ agentConfig, link, lineNumber }) => {
-        const findLink = findConfiguration(lineNumber).find(GlLink);
+        const findLink = findConfiguration(lineNumber).findComponent(GlLink);
 
         expect(findLink.attributes('href')).toBe(link);
         expect(findConfiguration(lineNumber).text()).toBe(agentConfig);
diff --git a/spec/frontend/clusters_list/components/agents_spec.js b/spec/frontend/clusters_list/components/agents_spec.js
index 92cfff7d490..bff1e573dbd 100644
--- a/spec/frontend/clusters_list/components/agents_spec.js
+++ b/spec/frontend/clusters_list/components/agents_spec.js
@@ -334,7 +334,7 @@ describe('Agents', () => {
     });
 
     it('displays a loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/clusters_list/components/ancestor_notice_spec.js b/spec/frontend/clusters_list/components/ancestor_notice_spec.js
index a9f11e6fdf8..758f6586e1a 100644
--- a/spec/frontend/clusters_list/components/ancestor_notice_spec.js
+++ b/spec/frontend/clusters_list/components/ancestor_notice_spec.js
@@ -46,7 +46,7 @@ describe('ClustersAncestorNotice', () => {
     });
 
     it('displays link', () => {
-      expect(wrapper.find(GlLink).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLink).exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/clusters_list/components/clusters_spec.js b/spec/frontend/clusters_list/components/clusters_spec.js
index 5c7635c1617..a3f42c1f161 100644
--- a/spec/frontend/clusters_list/components/clusters_spec.js
+++ b/spec/frontend/clusters_list/components/clusters_spec.js
@@ -142,7 +142,7 @@ describe('Clusters', () => {
       ({ lineNumber, result }) => {
         const statuses = findStatuses();
         const status = statuses.at(lineNumber);
-        expect(status.find(GlLoadingIcon).exists()).toBe(result);
+        expect(status.findComponent(GlLoadingIcon).exists()).toBe(result);
       },
     );
   });
diff --git a/spec/frontend/clusters_list/components/node_error_help_text_spec.js b/spec/frontend/clusters_list/components/node_error_help_text_spec.js
index 8187ab75c58..3211ba44eff 100644
--- a/spec/frontend/clusters_list/components/node_error_help_text_spec.js
+++ b/spec/frontend/clusters_list/components/node_error_help_text_spec.js
@@ -11,7 +11,7 @@ describe('NodeErrorHelpText', () => {
     await nextTick();
   };
 
-  const findPopover = () => wrapper.find(GlPopover);
+  const findPopover = () => wrapper.findComponent(GlPopover);
 
   afterEach(() => {
     wrapper.destroy();