Add latest changes from gitlab-org/gitlab@master

4 files changed, 10 insertions, 10 deletions

diff --git a/spec/frontend/user_lists/components/edit_user_list_spec.js b/spec/frontend/user_lists/components/edit_user_list_spec.js
index 941c8244247..5f067d9de3c 100644
--- a/spec/frontend/user_lists/components/edit_user_list_spec.js
+++ b/spec/frontend/user_lists/components/edit_user_list_spec.js
@@ -47,7 +47,7 @@ describe('user_lists/components/edit_user_list', () => {
     });
 
     it('should show a loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
   });
 
@@ -60,7 +60,7 @@ describe('user_lists/components/edit_user_list', () => {
       factory();
       await waitForPromises();
 
-      alert = wrapper.find(GlAlert);
+      alert = wrapper.findComponent(GlAlert);
     });
 
     it('should show a flash with the error respopnse', () => {
@@ -72,7 +72,7 @@ describe('user_lists/components/edit_user_list', () => {
     });
 
     it('should not show a user list form', () => {
-      expect(wrapper.find(UserListForm).exists()).toBe(false);
+      expect(wrapper.findComponent(UserListForm).exists()).toBe(false);
     });
   });
 
@@ -129,7 +129,7 @@ describe('user_lists/components/edit_user_list', () => {
         clickSave();
         await waitForPromises();
 
-        alert = wrapper.find(GlAlert);
+        alert = wrapper.findComponent(GlAlert);
       });
 
       it('should show a flash with the error respopnse', () => {
diff --git a/spec/frontend/user_lists/components/new_user_list_spec.js b/spec/frontend/user_lists/components/new_user_list_spec.js
index ace4a284347..8683cf2463c 100644
--- a/spec/frontend/user_lists/components/new_user_list_spec.js
+++ b/spec/frontend/user_lists/components/new_user_list_spec.js
@@ -72,7 +72,7 @@ describe('user_lists/components/new_user_list', () => {
 
         await waitForPromises();
 
-        alert = wrapper.find(GlAlert);
+        alert = wrapper.findComponent(GlAlert);
       });
 
       it('should show a flash with the error respopnse', () => {
diff --git a/spec/frontend/user_lists/components/user_list_spec.js b/spec/frontend/user_lists/components/user_list_spec.js
index f126c733dd5..e02862cad2b 100644
--- a/spec/frontend/user_lists/components/user_list_spec.js
+++ b/spec/frontend/user_lists/components/user_list_spec.js
@@ -50,7 +50,7 @@ describe('User List', () => {
     });
 
     it('shows a loading icon', () => {
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
   });
 
@@ -157,7 +157,7 @@ describe('User List', () => {
   });
 
   describe('error', () => {
-    const findAlert = () => wrapper.find(GlAlert);
+    const findAlert = () => wrapper.findComponent(GlAlert);
 
     beforeEach(async () => {
       Api.fetchFeatureFlagUserList.mockRejectedValue();
@@ -190,7 +190,7 @@ describe('User List', () => {
     });
 
     it('displays an empty state', () => {
-      expect(wrapper.find(GlEmptyState).exists()).toBe(true);
+      expect(wrapper.findComponent(GlEmptyState).exists()).toBe(true);
     });
   });
 });
diff --git a/spec/frontend/user_lists/components/user_lists_table_spec.js b/spec/frontend/user_lists/components/user_lists_table_spec.js
index fb5093eb065..3324b040b86 100644
--- a/spec/frontend/user_lists/components/user_lists_table_spec.js
+++ b/spec/frontend/user_lists/components/user_lists_table_spec.js
@@ -59,7 +59,7 @@ describe('User Lists Table', () => {
 
   describe('delete button', () => {
     it('should display the confirmation modal', async () => {
-      const modal = wrapper.find(GlModal);
+      const modal = wrapper.findComponent(GlModal);
 
       wrapper.find('[data-testid="delete-user-list"]').trigger('click');
 
@@ -73,7 +73,7 @@ describe('User Lists Table', () => {
     let modal;
 
     beforeEach(async () => {
-      modal = wrapper.find(GlModal);
+      modal = wrapper.findComponent(GlModal);
 
       wrapper.find('button').trigger('click');