Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

8 files changed, 34 insertions, 26 deletions

diff --git a/spec/frontend/members/components/app_spec.js b/spec/frontend/members/components/app_spec.js
index 05933e36b52..b9fdf8792fd 100644
--- a/spec/frontend/members/components/app_spec.js
+++ b/spec/frontend/members/components/app_spec.js
@@ -33,7 +33,7 @@ describe('MembersApp', () => {
 
     wrapper = shallowMount(MembersApp, {
       localVue,
-      provide: {
+      propsData: {
         namespace: MEMBER_TYPES.user,
       },
       store,
diff --git a/spec/frontend/members/components/members_tabs_spec.js b/spec/frontend/members/components/members_tabs_spec.js
index 28614b52706..6f1a6d0c223 100644
--- a/spec/frontend/members/components/members_tabs_spec.js
+++ b/spec/frontend/members/components/members_tabs_spec.js
@@ -6,7 +6,7 @@ import MembersTabs from '~/members/components/members_tabs.vue';
 import { MEMBER_TYPES } from '~/members/constants';
 import { pagination } from '../mock_data';
 
-describe('MembersApp', () => {
+describe('MembersTabs', () => {
   Vue.use(Vuex);
 
   let wrapper;
@@ -111,10 +111,10 @@ describe('MembersApp', () => {
 
       const membersApps = wrapper.findAllComponents(MembersApp).wrappers;
 
-      expect(membersApps[0].attributes('namespace')).toBe(MEMBER_TYPES.user);
-      expect(membersApps[1].attributes('namespace')).toBe(MEMBER_TYPES.group);
-      expect(membersApps[2].attributes('namespace')).toBe(MEMBER_TYPES.invite);
-      expect(membersApps[3].attributes('namespace')).toBe(MEMBER_TYPES.accessRequest);
+      expect(membersApps[0].props('namespace')).toBe(MEMBER_TYPES.user);
+      expect(membersApps[1].props('namespace')).toBe(MEMBER_TYPES.group);
+      expect(membersApps[2].props('namespace')).toBe(MEMBER_TYPES.invite);
+      expect(membersApps[3].props('namespace')).toBe(MEMBER_TYPES.accessRequest);
     });
   });
 
diff --git a/spec/frontend/members/components/modals/remove_group_link_modal_spec.js b/spec/frontend/members/components/modals/remove_group_link_modal_spec.js
index 01279581c55..313c237f51c 100644
--- a/spec/frontend/members/components/modals/remove_group_link_modal_spec.js
+++ b/spec/frontend/members/components/modals/remove_group_link_modal_spec.js
@@ -109,6 +109,6 @@ describe('RemoveGroupLinkModal', () => {
   it('modal does not show when `removeGroupLinkModalVisible` is `false`', () => {
     createComponent({ removeGroupLinkModalVisible: false });
 
-    expect(findModal().vm.$attrs.visible).toBe(false);
+    expect(findModal().props().visible).toBe(false);
   });
 });
diff --git a/spec/frontend/members/components/table/expires_at_spec.js b/spec/frontend/members/components/table/expires_at_spec.js
index 02fe3c6d684..2b8e6ab8f2a 100644
--- a/spec/frontend/members/components/table/expires_at_spec.js
+++ b/spec/frontend/members/components/table/expires_at_spec.js
@@ -54,7 +54,7 @@ describe('ExpiresAt', () => {
       const tooltipDirective = getTooltipDirective(expiredText);
 
       expect(tooltipDirective).not.toBeUndefined();
-      expect(expiredText.attributes('title')).toBe('Mar 15, 2019 12:00am GMT+0000');
+      expect(expiredText.attributes('title')).toBe('Mar 15, 2019 12:00am UTC');
     });
   });
 
diff --git a/spec/frontend/members/components/table/role_dropdown_spec.js b/spec/frontend/members/components/table/role_dropdown_spec.js
index c8b6bead450..a4a4c620921 100644
--- a/spec/frontend/members/components/table/role_dropdown_spec.js
+++ b/spec/frontend/members/components/table/role_dropdown_spec.js
@@ -88,7 +88,7 @@ describe('RoleDropdown', () => {
     });
 
     it('renders dropdown header', () => {
-      expect(getByTextInDropdownMenu('Change permissions').exists()).toBe(true);
+      expect(getByTextInDropdownMenu('Change role').exists()).toBe(true);
     });
 
     it('sets dropdown toggle and checks selected role', () => {
diff --git a/spec/frontend/members/index_spec.js b/spec/frontend/members/index_spec.js
index b07534ae4ed..efabe54f238 100644
--- a/spec/frontend/members/index_spec.js
+++ b/spec/frontend/members/index_spec.js
@@ -1,5 +1,5 @@
 import { createWrapper } from '@vue/test-utils';
-import MembersApp from '~/members/components/app.vue';
+import MembersTabs from '~/members/components/members_tabs.vue';
 import { MEMBER_TYPES } from '~/members/constants';
 import { initMembersApp } from '~/members/index';
 import { members, pagination, dataAttribute } from './mock_data';
@@ -11,12 +11,13 @@ describe('initMembersApp', () => {
 
   const setup = () => {
     vm = initMembersApp(el, {
-      namespace: MEMBER_TYPES.user,
-      tableFields: ['account'],
-      tableAttrs: { table: { 'data-qa-selector': 'members_list' } },
-      tableSortableFields: ['account'],
-      requestFormatter: () => ({}),
-      filteredSearchBar: { show: false },
+      [MEMBER_TYPES.user]: {
+        tableFields: ['account'],
+        tableAttrs: { table: { 'data-qa-selector': 'members_list' } },
+        tableSortableFields: ['account'],
+        requestFormatter: () => ({}),
+        filteredSearchBar: { show: false },
+      },
     });
     wrapper = createWrapper(vm);
   };
@@ -35,10 +36,10 @@ describe('initMembersApp', () => {
     wrapper = null;
   });
 
-  it('renders `MembersApp`', () => {
+  it('renders `MembersTabs`', () => {
     setup();
 
-    expect(wrapper.find(MembersApp).exists()).toBe(true);
+    expect(wrapper.find(MembersTabs).exists()).toBe(true);
   });
 
   it('parses and sets `members` in Vuex store', () => {
diff --git a/spec/frontend/members/mock_data.js b/spec/frontend/members/mock_data.js
index d0a7c36349b..4275db5fa9f 100644
--- a/spec/frontend/members/mock_data.js
+++ b/spec/frontend/members/mock_data.js
@@ -1,3 +1,5 @@
+import { MEMBER_TYPES } from '~/members/constants';
+
 export const member = {
   requestedAt: null,
   canUpdate: false,
@@ -28,6 +30,7 @@ export const member = {
   usingLicense: false,
   groupSso: false,
   groupManagedAccount: false,
+  provisionedByThisGroup: false,
   validRoles: {
     Guest: 10,
     Reporter: 20,
@@ -97,10 +100,12 @@ export const pagination = {
 };
 
 export const dataAttribute = JSON.stringify({
-  members,
-  pagination: paginationData,
+  [MEMBER_TYPES.user]: {
+    members,
+    pagination: paginationData,
+    member_path: '/groups/foo-bar/-/group_members/:id',
+    ldap_override_path: '/groups/ldap-group/-/group_members/:id/override',
+  },
   source_id: 234,
   can_manage_members: true,
-  member_path: '/groups/foo-bar/-/group_members/:id',
-  ldap_override_path: '/groups/ldap-group/-/group_members/:id/override',
 });
diff --git a/spec/frontend/members/utils_spec.js b/spec/frontend/members/utils_spec.js
index 72696979722..9740e1c2edb 100644
--- a/spec/frontend/members/utils_spec.js
+++ b/spec/frontend/members/utils_spec.js
@@ -1,4 +1,4 @@
-import { DEFAULT_SORT } from '~/members/constants';
+import { DEFAULT_SORT, MEMBER_TYPES } from '~/members/constants';
 import {
   generateBadges,
   isGroup,
@@ -268,11 +268,13 @@ describe('Members Utils', () => {
 
     it('correctly parses the data attribute', () => {
       expect(parseDataAttributes(el)).toMatchObject({
-        members,
-        pagination,
+        [MEMBER_TYPES.user]: {
+          members,
+          pagination,
+          memberPath: '/groups/foo-bar/-/group_members/:id',
+        },
         sourceId: 234,
         canManageMembers: true,
-        memberPath: '/groups/foo-bar/-/group_members/:id',
       });
     });
   });