Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

2 files changed, 16 insertions, 0 deletions

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 13887f28d22..d0792fa7b73 100644
--- a/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js
+++ b/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js
@@ -48,12 +48,16 @@ describe('UncollapsedReviewerList component', () => {
     });
 
     it('renders re-request loading icon', async () => {
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       await wrapper.setData({ loadingStates: { 1: 'loading' } });
 
       expect(wrapper.find('[data-testid="re-request-button"]').props('loading')).toBe(true);
     });
 
     it('renders re-request success icon', async () => {
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       await wrapper.setData({ loadingStates: { 1: 'success' } });
 
       expect(wrapper.find('[data-testid="re-request-success"]').exists()).toBe(true);
@@ -98,6 +102,8 @@ describe('UncollapsedReviewerList component', () => {
     });
 
     it('renders re-request loading icon', async () => {
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       await wrapper.setData({ loadingStates: { 2: 'loading' } });
 
       expect(wrapper.findAll('[data-testid="re-request-button"]').length).toBe(2);
@@ -107,6 +113,8 @@ describe('UncollapsedReviewerList component', () => {
     });
 
     it('renders re-request success icon', async () => {
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       await wrapper.setData({ loadingStates: { 2: 'success' } });
 
       expect(wrapper.findAll('[data-testid="re-request-button"]').length).toBe(1);
diff --git a/spec/frontend/sidebar/participants_spec.js b/spec/frontend/sidebar/participants_spec.js
index 1210f7c9531..94cdbe7f2ef 100644
--- a/spec/frontend/sidebar/participants_spec.js
+++ b/spec/frontend/sidebar/participants_spec.js
@@ -85,6 +85,8 @@ describe('Participants', () => {
         numberOfLessParticipants,
       });
 
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({
         isShowingMoreParticipants: false,
       });
@@ -101,6 +103,8 @@ describe('Participants', () => {
         numberOfLessParticipants: 2,
       });
 
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({
         isShowingMoreParticipants: true,
       });
@@ -129,6 +133,8 @@ describe('Participants', () => {
         numberOfLessParticipants: 2,
       });
 
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({
         isShowingMoreParticipants: false,
       });
@@ -145,6 +151,8 @@ describe('Participants', () => {
         numberOfLessParticipants: 2,
       });
 
+      // setData usage is discouraged. See https://gitlab.com/groups/gitlab-org/-/epics/7330 for details
+      // eslint-disable-next-line no-restricted-syntax
       wrapper.setData({
         isShowingMoreParticipants: true,
       });