Add latest changes from gitlab-org/gitlab@master

2 files changed, 27 insertions, 3 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 e8de50f485f..b6b34e1063b 100644
--- a/spec/frontend/invite_members/components/invite_members_modal_spec.js
+++ b/spec/frontend/invite_members/components/invite_members_modal_spec.js
@@ -365,7 +365,7 @@ describe('InviteMembersModal', () => {
 
   describe('rendering the user limit notification', () => {
     it('shows the user limit notification alert when reached limit', () => {
-      const usersLimitDataset = { reachedLimit: true };
+      const usersLimitDataset = { alertVariant: 'reached' };
 
       createInviteMembersToProjectWrapper(usersLimitDataset);
 
@@ -373,7 +373,15 @@ describe('InviteMembersModal', () => {
     });
 
     it('shows the user limit notification alert when close to dashboard limit', () => {
-      const usersLimitDataset = { closeToDashboardLimit: true };
+      const usersLimitDataset = { alertVariant: 'close' };
+
+      createInviteMembersToProjectWrapper(usersLimitDataset);
+
+      expect(findUserLimitAlert().exists()).toBe(true);
+    });
+
+    it('shows the user limit notification alert when :preview_free_user_cap is enabled', () => {
+      const usersLimitDataset = { alertVariant: 'notification' };
 
       createInviteMembersToProjectWrapper(usersLimitDataset);
 
diff --git a/spec/frontend/invite_members/components/user_limit_notification_spec.js b/spec/frontend/invite_members/components/user_limit_notification_spec.js
index 2a780490468..0b8a284c63a 100644
--- a/spec/frontend/invite_members/components/user_limit_notification_spec.js
+++ b/spec/frontend/invite_members/components/user_limit_notification_spec.js
@@ -1,9 +1,14 @@
 import { GlAlert, GlSprintf } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import UserLimitNotification from '~/invite_members/components/user_limit_notification.vue';
-import { REACHED_LIMIT_VARIANT, CLOSE_TO_LIMIT_VARIANT } from '~/invite_members/constants';
+import {
+  NOTIFICATION_LIMIT_VARIANT,
+  REACHED_LIMIT_VARIANT,
+  CLOSE_TO_LIMIT_VARIANT,
+} from '~/invite_members/constants';
 import { freeUsersLimit, remainingSeats } from '../mock_data/member_modal';
 
+const INFO_ALERT_TITLE = 'Your namespace name is over the 5 user limit.';
 const WARNING_ALERT_TITLE = 'You only have space for 2 more members in name';
 
 describe('UserLimitNotification', () => {
@@ -31,6 +36,17 @@ describe('UserLimitNotification', () => {
     });
   };
 
+  describe('when previewing free user cap', () => {
+    it("renders user's preview limit notification", () => {
+      createComponent(NOTIFICATION_LIMIT_VARIANT);
+
+      const alert = findAlert();
+
+      expect(alert.attributes('title')).toEqual(INFO_ALERT_TITLE);
+      expect(alert.text()).toContain('GitLab will enforce this limit in the future.');
+    });
+  });
+
   describe('when close to limit within a group', () => {
     it("renders user's limit notification", () => {
       createComponent(CLOSE_TO_LIMIT_VARIANT);