Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

4 files changed, 7 insertions, 7 deletions

diff --git a/spec/frontend/profile/account/components/delete_account_modal_spec.js b/spec/frontend/profile/account/components/delete_account_modal_spec.js
index ad62d84c43c..e4a316e1ee7 100644
--- a/spec/frontend/profile/account/components/delete_account_modal_spec.js
+++ b/spec/frontend/profile/account/components/delete_account_modal_spec.js
@@ -53,7 +53,7 @@ describe('DeleteAccountModal component', () => {
       input: vm.$el.querySelector(`[name="${confirmation}"]`),
     };
   };
-  const findModal = () => wrapper.find(GlModalStub);
+  const findModal = () => wrapper.findComponent(GlModalStub);
 
   describe('with password confirmation', () => {
     beforeEach(async () => {
diff --git a/spec/frontend/profile/account/components/update_username_spec.js b/spec/frontend/profile/account/components/update_username_spec.js
index 0e56bccf27e..e331eed1863 100644
--- a/spec/frontend/profile/account/components/update_username_spec.js
+++ b/spec/frontend/profile/account/components/update_username_spec.js
@@ -44,7 +44,7 @@ describe('UpdateUsername component', () => {
   });
 
   const findElements = () => {
-    const modal = wrapper.find(GlModal);
+    const modal = wrapper.findComponent(GlModal);
 
     return {
       modal,
@@ -149,7 +149,7 @@ describe('UpdateUsername component', () => {
 
       await expect(wrapper.vm.onConfirm()).rejects.toThrow();
 
-      expect(createFlash).toBeCalledWith({
+      expect(createFlash).toHaveBeenCalledWith({
         message: 'Invalid username',
       });
     });
@@ -161,7 +161,7 @@ describe('UpdateUsername component', () => {
 
       await expect(wrapper.vm.onConfirm()).rejects.toThrow();
 
-      expect(createFlash).toBeCalledWith({
+      expect(createFlash).toHaveBeenCalledWith({
         message: 'An error occurred while updating your username, please try again.',
       });
     });
diff --git a/spec/frontend/profile/preferences/components/integration_view_spec.js b/spec/frontend/profile/preferences/components/integration_view_spec.js
index 92c53b8c91b..f650bee7fda 100644
--- a/spec/frontend/profile/preferences/components/integration_view_spec.js
+++ b/spec/frontend/profile/preferences/components/integration_view_spec.js
@@ -98,6 +98,6 @@ describe('IntegrationView component', () => {
   it('should render the help text', () => {
     wrapper = createComponent();
 
-    expect(wrapper.find(IntegrationHelpText).exists()).toBe(true);
+    expect(wrapper.findComponent(IntegrationHelpText).exists()).toBe(true);
   });
 });
diff --git a/spec/frontend/profile/preferences/components/profile_preferences_spec.js b/spec/frontend/profile/preferences/components/profile_preferences_spec.js
index 4d2dcf83d3b..89ce838a383 100644
--- a/spec/frontend/profile/preferences/components/profile_preferences_spec.js
+++ b/spec/frontend/profile/preferences/components/profile_preferences_spec.js
@@ -90,7 +90,7 @@ describe('ProfilePreferences component', () => {
 
   it('should not render Integrations section', () => {
     wrapper = createComponent();
-    const views = wrapper.findAll(IntegrationView);
+    const views = wrapper.findAllComponents(IntegrationView);
     const divider = findIntegrationsDivider();
     const heading = findIntegrationsHeading();
 
@@ -103,7 +103,7 @@ describe('ProfilePreferences component', () => {
     wrapper = createComponent({ provide: { integrationViews } });
     const divider = findIntegrationsDivider();
     const heading = findIntegrationsHeading();
-    const views = wrapper.findAll(IntegrationView);
+    const views = wrapper.findAllComponents(IntegrationView);
 
     expect(divider.exists()).toBe(true);
     expect(heading.exists()).toBe(true);