Add latest changes from gitlab-org/gitlab@master

8 files changed, 18 insertions, 18 deletions

diff --git a/spec/frontend/groups/components/app_spec.js b/spec/frontend/groups/components/app_spec.js
index a6bbea648d2..2796a561953 100644
--- a/spec/frontend/groups/components/app_spec.js
+++ b/spec/frontend/groups/components/app_spec.js
@@ -481,7 +481,7 @@ describe('AppComponent', () => {
     it('should render loading icon', async () => {
       vm.isLoading = true;
       await nextTick();
-      expect(wrapper.find(GlLoadingIcon).exists()).toBe(true);
+      expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
     });
 
     it('should render groups tree', async () => {
@@ -494,7 +494,7 @@ describe('AppComponent', () => {
     it('renders modal confirmation dialog', () => {
       createShallowComponent();
 
-      const findGlModal = wrapper.find(GlModal);
+      const findGlModal = wrapper.findComponent(GlModal);
 
       expect(findGlModal.exists()).toBe(true);
       expect(findGlModal.attributes('title')).toBe('Are you sure?');
diff --git a/spec/frontend/groups/components/empty_state_spec.js b/spec/frontend/groups/components/empty_state_spec.js
index c0e71e814d0..fbeaa32b1ec 100644
--- a/spec/frontend/groups/components/empty_state_spec.js
+++ b/spec/frontend/groups/components/empty_state_spec.js
@@ -68,7 +68,7 @@ describe('EmptyState', () => {
     it('renders empty state', () => {
       createComponent({ provide: { canCreateSubgroups: false, canCreateProjects: false } });
 
-      expect(wrapper.find(GlEmptyState).props()).toMatchObject({
+      expect(wrapper.findComponent(GlEmptyState).props()).toMatchObject({
         title: EmptyState.i18n.withoutLinks.title,
         description: EmptyState.i18n.withoutLinks.description,
         svgPath: defaultProvide.emptySubgroupIllustration,
diff --git a/spec/frontend/groups/components/invite_members_banner_spec.js b/spec/frontend/groups/components/invite_members_banner_spec.js
index 1924f400861..d25b45bd662 100644
--- a/spec/frontend/groups/components/invite_members_banner_spec.js
+++ b/spec/frontend/groups/components/invite_members_banner_spec.js
@@ -71,7 +71,7 @@ describe('InviteMembersBanner', () => {
     describe('when the button is clicked', () => {
       beforeEach(() => {
         jest.spyOn(eventHub, '$emit').mockImplementation(() => {});
-        wrapper.find(GlBanner).vm.$emit('primary');
+        wrapper.findComponent(GlBanner).vm.$emit('primary');
       });
 
       it('calls openModal through the eventHub', () => {
@@ -92,7 +92,7 @@ describe('InviteMembersBanner', () => {
       mockAxios.onPost(provide.calloutsPath).replyOnce(200);
       const dismissEvent = 'invite_members_banner_dismissed';
 
-      wrapper.find(GlBanner).vm.$emit('close');
+      wrapper.findComponent(GlBanner).vm.$emit('close');
 
       expect(trackingSpy).toHaveBeenCalledWith(trackCategory, dismissEvent, {
         label: provide.trackLabel,
@@ -102,7 +102,7 @@ describe('InviteMembersBanner', () => {
 
   describe('rendering', () => {
     const findBanner = () => {
-      return wrapper.find(GlBanner);
+      return wrapper.findComponent(GlBanner);
     };
 
     beforeEach(() => {
@@ -132,16 +132,16 @@ describe('InviteMembersBanner', () => {
     });
 
     it('should render the banner when not dismissed', () => {
-      expect(wrapper.find(GlBanner).exists()).toBe(true);
+      expect(wrapper.findComponent(GlBanner).exists()).toBe(true);
     });
 
     it('should close the banner when dismiss is clicked', async () => {
       mockAxios.onPost(provide.calloutsPath).replyOnce(200);
-      expect(wrapper.find(GlBanner).exists()).toBe(true);
-      wrapper.find(GlBanner).vm.$emit('close');
+      expect(wrapper.findComponent(GlBanner).exists()).toBe(true);
+      wrapper.findComponent(GlBanner).vm.$emit('close');
 
       await nextTick();
-      expect(wrapper.find(GlBanner).exists()).toBe(false);
+      expect(wrapper.findComponent(GlBanner).exists()).toBe(false);
     });
   });
 });
diff --git a/spec/frontend/groups/components/item_caret_spec.js b/spec/frontend/groups/components/item_caret_spec.js
index 4bf92bb5642..2333f04bb2e 100644
--- a/spec/frontend/groups/components/item_caret_spec.js
+++ b/spec/frontend/groups/components/item_caret_spec.js
@@ -22,8 +22,8 @@ describe('ItemCaret', () => {
     }
   });
 
-  const findAllGlIcons = () => wrapper.findAll(GlIcon);
-  const findGlIcon = () => wrapper.find(GlIcon);
+  const findAllGlIcons = () => wrapper.findAllComponents(GlIcon);
+  const findGlIcon = () => wrapper.findComponent(GlIcon);
 
   describe('template', () => {
     it('renders component template correctly', () => {
diff --git a/spec/frontend/groups/components/item_stats_spec.js b/spec/frontend/groups/components/item_stats_spec.js
index fdc267bc14a..0c2912adc66 100644
--- a/spec/frontend/groups/components/item_stats_spec.js
+++ b/spec/frontend/groups/components/item_stats_spec.js
@@ -24,7 +24,7 @@ describe('ItemStats', () => {
     }
   });
 
-  const findItemStatsValue = () => wrapper.find(ItemStatsValue);
+  const findItemStatsValue = () => wrapper.findComponent(ItemStatsValue);
 
   describe('template', () => {
     it('renders component container element correctly', () => {
diff --git a/spec/frontend/groups/components/item_stats_value_spec.js b/spec/frontend/groups/components/item_stats_value_spec.js
index 98186120a81..b9db83c7dd7 100644
--- a/spec/frontend/groups/components/item_stats_value_spec.js
+++ b/spec/frontend/groups/components/item_stats_value_spec.js
@@ -25,7 +25,7 @@ describe('ItemStatsValue', () => {
     }
   });
 
-  const findGlIcon = () => wrapper.find(GlIcon);
+  const findGlIcon = () => wrapper.findComponent(GlIcon);
   const findStatValue = () => wrapper.find('[data-testid="itemStatValue"]');
 
   describe('template', () => {
diff --git a/spec/frontend/groups/components/item_type_icon_spec.js b/spec/frontend/groups/components/item_type_icon_spec.js
index f3652f1a410..aa00e82150b 100644
--- a/spec/frontend/groups/components/item_type_icon_spec.js
+++ b/spec/frontend/groups/components/item_type_icon_spec.js
@@ -23,7 +23,7 @@ describe('ItemTypeIcon', () => {
     }
   });
 
-  const findGlIcon = () => wrapper.find(GlIcon);
+  const findGlIcon = () => wrapper.findComponent(GlIcon);
 
   describe('template', () => {
     it('renders component template correctly', () => {
diff --git a/spec/frontend/groups/components/visibility_level_dropdown_spec.js b/spec/frontend/groups/components/visibility_level_dropdown_spec.js
index 61b7bbb0833..49d0b182f7f 100644
--- a/spec/frontend/groups/components/visibility_level_dropdown_spec.js
+++ b/spec/frontend/groups/components/visibility_level_dropdown_spec.js
@@ -31,9 +31,9 @@ describe('Visibility Level Dropdown', () => {
 
   const hiddenInputValue = () =>
     wrapper.find("input[name='group[visibility_level]']").attributes('value');
-  const dropdownText = () => wrapper.find(GlDropdown).props('text');
+  const dropdownText = () => wrapper.findComponent(GlDropdown).props('text');
   const findDropdownItems = () =>
-    wrapper.findAll(GlDropdownItem).wrappers.map((option) => ({
+    wrapper.findAllComponents(GlDropdownItem).wrappers.map((option) => ({
       text: option.text(),
       secondaryText: option.props('secondaryText'),
     }));
@@ -56,7 +56,7 @@ describe('Visibility Level Dropdown', () => {
 
   describe('Selecting an option', () => {
     beforeEach(() => {
-      wrapper.findAll(GlDropdownItem).at(1).vm.$emit('click');
+      wrapper.findAllComponents(GlDropdownItem).at(1).vm.$emit('click');
     });
 
     it('sets the value of the hidden input to the selected value', () => {