Add latest changes from gitlab-org/gitlab@master

3 files changed, 8 insertions, 7 deletions

diff --git a/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
index 94a1c5e16e7..a8fec9b23dd 100644
--- a/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
+++ b/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
@@ -58,9 +58,9 @@ describe('Ci variable modal', () => {
     });
   };
 
-  const findCiEnvironmentsDropdown = () => wrapper.find(CiEnvironmentsDropdown);
+  const findCiEnvironmentsDropdown = () => wrapper.findComponent(CiEnvironmentsDropdown);
   const findReferenceWarning = () => wrapper.findByTestId('contains-variable-reference');
-  const findModal = () => wrapper.find(ModalStub);
+  const findModal = () => wrapper.findComponent(ModalStub);
   const findAWSTip = () => wrapper.findByTestId('aws-guidance-tip');
   const findAddorUpdateButton = () => wrapper.findByTestId('ciUpdateOrAddVariableBtn');
   const deleteVariableButton = () =>
@@ -72,7 +72,8 @@ describe('Ci variable modal', () => {
   const findMaskedVariableCheckbox = () => wrapper.findByTestId('ci-variable-masked-checkbox');
   const findValueField = () => wrapper.find('#ci-variable-value');
   const findEnvScopeLink = () => wrapper.findByTestId('environment-scope-link');
-  const findEnvScopeInput = () => wrapper.findByTestId('environment-scope').find(GlFormInput);
+  const findEnvScopeInput = () =>
+    wrapper.findByTestId('environment-scope').findComponent(GlFormInput);
   const findVariableTypeDropdown = () => wrapper.find('#ci-variable-type');
 
   afterEach(() => {
diff --git a/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js
index b43153d3d7c..4d0c378d10e 100644
--- a/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js
+++ b/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js
@@ -18,7 +18,7 @@ describe('Ci Variable Popover', () => {
     });
   };
 
-  const findButton = () => wrapper.find(GlButton);
+  const findButton = () => wrapper.findComponent(GlButton);
 
   beforeEach(() => {
     createComponent();
diff --git a/spec/frontend/ci_variable_list/components/legacy_ci_variable_modal_spec.js b/spec/frontend/ci_variable_list/components/legacy_ci_variable_modal_spec.js
index 6681ab91a4a..d8d2cbc764f 100644
--- a/spec/frontend/ci_variable_list/components/legacy_ci_variable_modal_spec.js
+++ b/spec/frontend/ci_variable_list/components/legacy_ci_variable_modal_spec.js
@@ -40,8 +40,8 @@ describe('Ci variable modal', () => {
     });
   };
 
-  const findCiEnvironmentsDropdown = () => wrapper.find(CiEnvironmentsDropdown);
-  const findModal = () => wrapper.find(ModalStub);
+  const findCiEnvironmentsDropdown = () => wrapper.findComponent(CiEnvironmentsDropdown);
+  const findModal = () => wrapper.findComponent(ModalStub);
   const findAddorUpdateButton = () => findModal().find('[data-testid="ciUpdateOrAddVariableBtn"]');
   const deleteVariableButton = () =>
     findModal()
@@ -213,7 +213,7 @@ describe('Ci variable modal', () => {
 
           const environmentScopeInput = wrapper
             .find('[data-testid="environment-scope"]')
-            .find(GlFormInput);
+            .findComponent(GlFormInput);
           expect(findCiEnvironmentsDropdown().exists()).toBe(false);
           expect(environmentScopeInput.attributes('readonly')).toBe('readonly');
         });