Add latest changes from gitlab-org/gitlab@master

6 files changed, 9 insertions, 9 deletions

diff --git a/spec/frontend/members/components/action_buttons/access_request_action_buttons_spec.js b/spec/frontend/members/components/action_buttons/access_request_action_buttons_spec.js
index 9a8434a1222..30166e2d5ae 100644
--- a/spec/frontend/members/components/action_buttons/access_request_action_buttons_spec.js
+++ b/spec/frontend/members/components/action_buttons/access_request_action_buttons_spec.js
@@ -49,7 +49,7 @@ describe('AccessRequestActionButtons', () => {
     describe('when member is the current user', () => {
       it('sets `message` prop correctly', () => {
         expect(findRemoveMemberButton().props('message')).toBe(
-          `Are you sure you want to withdraw your access request for "${member.source.name}"`,
+          `Are you sure you want to withdraw your access request for "${member.source.fullName}"`,
         );
       });
     });
@@ -64,7 +64,7 @@ describe('AccessRequestActionButtons', () => {
         });
 
         expect(findRemoveMemberButton().props('message')).toBe(
-          `Are you sure you want to deny ${member.user.name}'s request to join "${member.source.name}"`,
+          `Are you sure you want to deny ${member.user.name}'s request to join "${member.source.fullName}"`,
         );
       });
     });
diff --git a/spec/frontend/members/components/action_buttons/invite_action_buttons_spec.js b/spec/frontend/members/components/action_buttons/invite_action_buttons_spec.js
index 887b21dc1d0..fe63f9bfaa7 100644
--- a/spec/frontend/members/components/action_buttons/invite_action_buttons_spec.js
+++ b/spec/frontend/members/components/action_buttons/invite_action_buttons_spec.js
@@ -39,7 +39,7 @@ describe('InviteActionButtons', () => {
     it('sets props correctly', () => {
       expect(findRemoveMemberButton().props()).toEqual({
         memberId: member.id,
-        message: `Are you sure you want to revoke the invitation for ${member.invite.email} to join "${member.source.name}"`,
+        message: `Are you sure you want to revoke the invitation for ${member.invite.email} to join "${member.source.fullName}"`,
         title: 'Revoke invite',
         isAccessRequest: false,
         icon: 'remove',
diff --git a/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js b/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js
index b03e80a537d..f28e5040006 100644
--- a/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js
+++ b/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js
@@ -39,7 +39,7 @@ describe('UserActionButtons', () => {
     it('sets props correctly', () => {
       expect(findRemoveMemberButton().props()).toEqual({
         memberId: member.id,
-        message: `Are you sure you want to remove ${member.user.name} from "${member.source.name}"`,
+        message: `Are you sure you want to remove ${member.user.name} from "${member.source.fullName}"`,
         title: 'Remove member',
         isAccessRequest: false,
         icon: 'remove',
@@ -56,7 +56,7 @@ describe('UserActionButtons', () => {
         });
 
         expect(findRemoveMemberButton().props('message')).toBe(
-          `Are you sure you want to remove this orphaned member from "${orphanedMember.source.name}"`,
+          `Are you sure you want to remove this orphaned member from "${orphanedMember.source.fullName}"`,
         );
       });
     });
diff --git a/spec/frontend/members/components/modals/leave_modal_spec.js b/spec/frontend/members/components/modals/leave_modal_spec.js
index d7acf12212c..dca47d1f6af 100644
--- a/spec/frontend/members/components/modals/leave_modal_spec.js
+++ b/spec/frontend/members/components/modals/leave_modal_spec.js
@@ -60,11 +60,11 @@ describe('LeaveModal', () => {
   });
 
   it('displays modal title', () => {
-    expect(getByText(`Leave "${member.source.name}"`).exists()).toBe(true);
+    expect(getByText(`Leave "${member.source.fullName}"`).exists()).toBe(true);
   });
 
   it('displays modal body', () => {
-    expect(getByText(`Are you sure you want to leave "${member.source.name}"?`).exists()).toBe(
+    expect(getByText(`Are you sure you want to leave "${member.source.fullName}"?`).exists()).toBe(
       true,
     );
   });
diff --git a/spec/frontend/members/components/table/member_source_spec.js b/spec/frontend/members/components/table/member_source_spec.js
index 2580f36cd64..95547090aed 100644
--- a/spec/frontend/members/components/table/member_source_spec.js
+++ b/spec/frontend/members/components/table/member_source_spec.js
@@ -11,7 +11,7 @@ describe('MemberSource', () => {
       propsData: {
         memberSource: {
           id: 102,
-          name: 'Foo bar',
+          fullName: 'Foo bar',
           webUrl: 'https://gitlab.com/groups/foo-bar',
         },
         ...propsData,
diff --git a/spec/frontend/members/mock_data.js b/spec/frontend/members/mock_data.js
index 5674929716d..e668f2a1998 100644
--- a/spec/frontend/members/mock_data.js
+++ b/spec/frontend/members/mock_data.js
@@ -7,7 +7,7 @@ export const member = {
   accessLevel: { integerValue: 50, stringValue: 'Owner' },
   source: {
     id: 178,
-    name: 'Foo Bar',
+    fullName: 'Foo Bar',
     webUrl: 'https://gitlab.com/groups/foo-bar',
   },
   user: {