Add latest changes from gitlab-org/gitlab@master

2 files changed, 59 insertions, 33 deletions

diff --git a/spec/frontend/invite_members/components/invite_members_modal_spec.js b/spec/frontend/invite_members/components/invite_members_modal_spec.js
index 9229854e3ab..9ef9589d54c 100644
--- a/spec/frontend/invite_members/components/invite_members_modal_spec.js
+++ b/spec/frontend/invite_members/components/invite_members_modal_spec.js
@@ -19,7 +19,7 @@ import {
   MEMBERS_TO_PROJECT_CELEBRATE_INTRO_TEXT,
   LEARN_GITLAB,
   EXPANDED_ERRORS,
-  EMPTY_INVITES_ERROR_TEXT,
+  EMPTY_INVITES_ALERT_TEXT,
 } from '~/invite_members/constants';
 import eventHub from '~/invite_members/event_hub';
 import ContentTransition from '~/vue_shared/components/content_transition.vue';
@@ -96,6 +96,7 @@ describe('InviteMembersModal', () => {
   const findModal = () => wrapper.findComponent(GlModal);
   const findBase = () => wrapper.findComponent(InviteModalBase);
   const findIntroText = () => wrapper.findByTestId('modal-base-intro-text').text();
+  const findEmptyInvitesAlert = () => wrapper.findByTestId('empty-invites-alert');
   const findMemberErrorAlert = () => wrapper.findByTestId('alert-member-error');
   const findMoreInviteErrorsButton = () => wrapper.findByTestId('accordion-button');
   const findUserLimitAlert = () => wrapper.findComponent(UserLimitNotification);
@@ -398,7 +399,8 @@ describe('InviteMembersModal', () => {
 
         await waitForPromises();
 
-        expect(membersFormGroupInvalidFeedback()).toBe(EMPTY_INVITES_ERROR_TEXT);
+        expect(findEmptyInvitesAlert().text()).toBe(EMPTY_INVITES_ALERT_TEXT);
+        expect(membersFormGroupInvalidFeedback()).toBe(MEMBERS_PLACEHOLDER);
         expect(findMembersSelect().props('exceptionState')).toBe(false);
 
         await triggerMembersTokenSelect([user1]);
diff --git a/spec/frontend/invite_members/components/invite_modal_base_spec.js b/spec/frontend/invite_members/components/invite_modal_base_spec.js
index aeead8809fd..db2afbbd141 100644
--- a/spec/frontend/invite_members/components/invite_modal_base_spec.js
+++ b/spec/frontend/invite_members/components/invite_modal_base_spec.js
@@ -1,16 +1,15 @@
 import {
-  GlDropdown,
-  GlDropdownItem,
+  GlFormSelect,
   GlDatepicker,
   GlFormGroup,
-  GlSprintf,
   GlLink,
+  GlSprintf,
   GlModal,
   GlIcon,
 } from '@gitlab/ui';
 import { stubComponent } from 'helpers/stub_component';
 import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
-import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
+import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import InviteModalBase from '~/invite_members/components/invite_modal_base.vue';
 import ContentTransition from '~/vue_shared/components/content_transition.vue';
 
@@ -26,24 +25,30 @@ import { propsData, membersPath, purchasePath } from '../mock_data/modal_base';
 describe('InviteModalBase', () => {
   let wrapper;
 
-  const createComponent = (props = {}, stubs = {}) => {
-    wrapper = shallowMountExtended(InviteModalBase, {
+  const createComponent = ({ props = {}, stubs = {}, mountFn = shallowMountExtended } = {}) => {
+    const requiredStubs =
+      mountFn === mountExtended
+        ? {}
+        : {
+            ContentTransition,
+            GlFormSelect: true,
+            GlSprintf,
+            GlFormGroup: stubComponent(GlFormGroup, {
+              props: ['state', 'invalidFeedback'],
+            }),
+          };
+
+    wrapper = mountFn(InviteModalBase, {
       propsData: {
         ...propsData,
         ...props,
       },
       stubs: {
-        ContentTransition,
         GlModal: stubComponent(GlModal, {
           template:
             '<div><slot name="modal-title"></slot><slot></slot><slot name="modal-footer"></slot></div>',
         }),
-        GlDropdown: true,
-        GlDropdownItem: true,
-        GlSprintf,
-        GlFormGroup: stubComponent(GlFormGroup, {
-          props: ['state', 'invalidFeedback'],
-        }),
+        ...requiredStubs,
         ...stubs,
       },
     });
@@ -51,11 +56,10 @@ describe('InviteModalBase', () => {
 
   afterEach(() => {
     wrapper.destroy();
-    wrapper = null;
   });
 
-  const findDropdown = () => wrapper.findComponent(GlDropdown);
-  const findDropdownItems = () => findDropdown().findAllComponents(GlDropdownItem);
+  const findFormSelect = () => wrapper.findComponent(GlFormSelect);
+  const findFormSelectOptions = () => findFormSelect().findAllComponents('option');
   const findDatepicker = () => wrapper.findComponent(GlDatepicker);
   const findLink = () => wrapper.findComponent(GlLink);
   const findIcon = () => wrapper.findComponent(GlIcon);
@@ -97,16 +101,29 @@ describe('InviteModalBase', () => {
     });
 
     describe('rendering the access levels dropdown', () => {
+      beforeEach(() => {
+        createComponent({
+          mountFn: mountExtended,
+        });
+      });
+
       it('sets the default dropdown text to the default access level name', () => {
-        expect(findDropdown().attributes('text')).toBe('Guest');
+        expect(findFormSelect().exists()).toBe(true);
+        expect(findFormSelect().element.value).toBe('10');
       });
 
       it('renders dropdown items for each accessLevel', () => {
-        expect(findDropdownItems()).toHaveLength(5);
+        expect(findFormSelectOptions()).toHaveLength(5);
       });
     });
 
     describe('rendering the help link', () => {
+      beforeEach(() => {
+        createComponent({
+          mountFn: mountExtended,
+        });
+      });
+
       it('renders the correct link', () => {
         expect(findLink().attributes('href')).toBe(propsData.helpLink);
       });
@@ -126,7 +143,7 @@ describe('InviteModalBase', () => {
     });
 
     it('renders description', () => {
-      createComponent({}, { GlFormGroup });
+      createComponent({ stubs: { GlFormGroup } });
 
       expect(findMembersFormGroup().attributes('description')).toContain(
         propsData.formGroupDescription,
@@ -144,13 +161,16 @@ describe('InviteModalBase', () => {
 
       beforeEach(() => {
         createComponent(
-          { usersLimitDataset: { membersPath, purchasePath, reachedLimit: true } },
-          { GlModal, GlFormGroup },
+          { props: { usersLimitDataset: { membersPath, purchasePath, reachedLimit: true } } },
+          { stubs: { GlModal, GlFormGroup } },
         );
       });
 
       it('tracks actions', () => {
-        createComponent({ usersLimitDataset: { reachedLimit: true } }, { GlFormGroup, GlModal });
+        createComponent({
+          props: { usersLimitDataset: { reachedLimit: true } },
+          stubs: { GlFormGroup, GlModal },
+        });
         trackingSpy = mockTracking(undefined, wrapper.element, jest.spyOn);
 
         const modal = wrapper.findComponent(GlModal);
@@ -164,8 +184,8 @@ describe('InviteModalBase', () => {
 
     describe('when user limit is close on a personal namespace', () => {
       beforeEach(() => {
-        createComponent(
-          {
+        createComponent({
+          props: {
             usersLimitDataset: {
               membersPath,
               userNamespace: true,
@@ -173,8 +193,8 @@ describe('InviteModalBase', () => {
               reachedLimit: false,
             },
           },
-          { GlModal, GlFormGroup },
-        );
+          stubs: { GlModal, GlFormGroup },
+        });
       });
 
       it('renders correct buttons', () => {
@@ -190,16 +210,16 @@ describe('InviteModalBase', () => {
     });
 
     describe('when users limit is not reached', () => {
-      const textRegex = /Select a role.+Read more about role permissions Access expiration date \(optional\)/;
+      const textRegex = /Select a role\s*Read more about role permissions\s*Access expiration date \(optional\)/;
 
       beforeEach(() => {
-        createComponent({ reachedLimit: false }, { GlModal, GlFormGroup });
+        createComponent({ props: { reachedLimit: false }, stubs: { GlModal, GlFormGroup } });
       });
 
       it('renders correct blocks', () => {
         expect(findIcon().exists()).toBe(false);
         expect(findDisabledInput().exists()).toBe(false);
-        expect(findDropdown().exists()).toBe(true);
+        expect(findFormSelect().exists()).toBe(true);
         expect(findDatepicker().exists()).toBe(true);
         expect(wrapper.findComponent(GlModal).text()).toMatch(textRegex);
       });
@@ -213,7 +233,9 @@ describe('InviteModalBase', () => {
 
   it('with isLoading, shows loading for invite button', () => {
     createComponent({
-      isLoading: true,
+      props: {
+        isLoading: true,
+      },
     });
 
     expect(wrapper.findComponent(GlModal).props('actionPrimary').attributes.loading).toBe(true);
@@ -221,7 +243,9 @@ describe('InviteModalBase', () => {
 
   it('with invalidFeedbackMessage, set members form group exception state', () => {
     createComponent({
-      invalidFeedbackMessage: 'invalid message!',
+      props: {
+        invalidFeedbackMessage: 'invalid message!',
+      },
     });
 
     expect(findMembersFormGroup().props()).toEqual({