Add latest changes from gitlab-org/gitlab@master

4 files changed, 14 insertions, 12 deletions

diff --git a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js
index 5aa8264b98c..81ff51133bf 100644
--- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js
+++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js
@@ -23,7 +23,7 @@ describe('CollapsedAssigneeList component', () => {
 
   const findNoUsersIcon = () => wrapper.find(GlIcon);
   const findAvatarCounter = () => wrapper.find('.avatar-counter');
-  const findAssignees = () => wrapper.findAll(CollapsedAssignee);
+  const findAssignees = () => wrapper.findAllComponents(CollapsedAssignee);
   const getTooltipTitle = () => wrapper.attributes('title');
 
   afterEach(() => {
diff --git a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js
index f7437386814..b902d7313fd 100644
--- a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js
+++ b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js
@@ -42,7 +42,7 @@ describe('UncollapsedAssigneeList component', () => {
     });
 
     it('only has one user', () => {
-      expect(wrapper.findAll(AssigneeAvatarLink).length).toBe(1);
+      expect(wrapper.findAllComponents(AssigneeAvatarLink).length).toBe(1);
     });
 
     it('calls the AssigneeAvatarLink with the proper props', () => {
@@ -79,7 +79,7 @@ describe('UncollapsedAssigneeList component', () => {
       });
 
       it('shows truncated users', () => {
-        expect(wrapper.findAll(AssigneeAvatarLink).length).toBe(DEFAULT_RENDER_COUNT);
+        expect(wrapper.findAllComponents(AssigneeAvatarLink).length).toBe(DEFAULT_RENDER_COUNT);
       });
 
       describe('when more button is clicked', () => {
@@ -94,7 +94,9 @@ describe('UncollapsedAssigneeList component', () => {
         });
 
         it('shows all users', () => {
-          expect(wrapper.findAll(AssigneeAvatarLink).length).toBe(DEFAULT_RENDER_COUNT + 1);
+          expect(wrapper.findAllComponents(AssigneeAvatarLink).length).toBe(
+            DEFAULT_RENDER_COUNT + 1,
+          );
         });
       });
     });
diff --git a/spec/frontend/sidebar/components/date/sidebar_inherit_date_spec.js b/spec/frontend/sidebar/components/date/sidebar_inherit_date_spec.js
index fda21e06987..a7556b9110c 100644
--- a/spec/frontend/sidebar/components/date/sidebar_inherit_date_spec.js
+++ b/spec/frontend/sidebar/components/date/sidebar_inherit_date_spec.js
@@ -5,10 +5,10 @@ import SidebarInheritDate from '~/sidebar/components/date/sidebar_inherit_date.v
 
 describe('SidebarInheritDate', () => {
   let wrapper;
-  const findFixedFormattedDate = () => wrapper.findAll(SidebarFormattedDate).at(0);
-  const findInheritFormattedDate = () => wrapper.findAll(SidebarFormattedDate).at(1);
-  const findFixedRadio = () => wrapper.findAll(GlFormRadio).at(0);
-  const findInheritRadio = () => wrapper.findAll(GlFormRadio).at(1);
+  const findFixedFormattedDate = () => wrapper.findAllComponents(SidebarFormattedDate).at(0);
+  const findInheritFormattedDate = () => wrapper.findAllComponents(SidebarFormattedDate).at(1);
+  const findFixedRadio = () => wrapper.findAllComponents(GlFormRadio).at(0);
+  const findInheritRadio = () => wrapper.findAllComponents(GlFormRadio).at(1);
 
   const createComponent = ({ dueDateIsFixed = false } = {}) => {
     wrapper = shallowMount(SidebarInheritDate, {
@@ -36,8 +36,8 @@ describe('SidebarInheritDate', () => {
   });
 
   it('displays formatted fixed and inherited dates with radio buttons', () => {
-    expect(wrapper.findAll(SidebarFormattedDate)).toHaveLength(2);
-    expect(wrapper.findAll(GlFormRadio)).toHaveLength(2);
+    expect(wrapper.findAllComponents(SidebarFormattedDate)).toHaveLength(2);
+    expect(wrapper.findAllComponents(GlFormRadio)).toHaveLength(2);
     expect(findFixedFormattedDate().props('formattedDate')).toBe('Apr 15, 2021');
     expect(findInheritFormattedDate().props('formattedDate')).toBe('May 15, 2021');
     expect(findFixedRadio().text()).toBe('Fixed:');
diff --git a/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js b/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js
index 2c24df2436a..d00c8dcb653 100644
--- a/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js
+++ b/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js
@@ -52,7 +52,7 @@ describe('UncollapsedReviewerList component', () => {
     });
 
     it('only has one user', () => {
-      expect(wrapper.findAll(ReviewerAvatarLink).length).toBe(1);
+      expect(wrapper.findAllComponents(ReviewerAvatarLink).length).toBe(1);
     });
 
     it('shows one user with avatar, and author name', () => {
@@ -96,7 +96,7 @@ describe('UncollapsedReviewerList component', () => {
     });
 
     it('has both users', () => {
-      expect(wrapper.findAll(ReviewerAvatarLink).length).toBe(2);
+      expect(wrapper.findAllComponents(ReviewerAvatarLink).length).toBe(2);
     });
 
     it('shows both users with avatar, and author name', () => {