Resolve EE/CE duplication in invite_modal_base

- https://gitlab.com/gitlab-org/gitlab/-/issues/354003

app/assets/javascripts/invite_members/components/invite_modal_base.vue

@@ -11,6 +11,7 @@ import {
   GlFormInput,
 } from '@gitlab/ui';
 import { sprintf } from '~/locale';
+import ContentTransition from '~/vue_shared/components/content_transition.vue';
 import {
   ACCESS_LEVEL,
   ACCESS_EXPIRE_DATE,
@@ -20,6 +21,17 @@ import {
   HEADER_CLOSE_LABEL,
 } from '../constants';
 
+const DEFAULT_SLOT = 'default';
+const DEFAULT_SLOTS = [
+  {
+    key: DEFAULT_SLOT,
+    attributes: {
+      class: 'invite-modal-content',
+      'data-testid': 'invite-modal-initial-content',
+    },
+  },
+];
+
 export default {
   components: {
     GlFormGroup,
@@ -31,6 +43,7 @@ export default {
     GlSprintf,
     GlButton,
     GlFormInput,
+    ContentTransition,
   },
   inheritAttrs: false,
   props: {
@@ -86,6 +99,21 @@ export default {
       required: false,
       default: '',
     },
+    submitButtonText: {
+      type: String,
+      required: false,
+      default: INVITE_BUTTON_TEXT,
+    },
+    currentSlot: {
+      type: String,
+      required: false,
+      default: DEFAULT_SLOT,
+    },
+    extraSlots: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
   },
   data() {
     // Be sure to check out reset!
@@ -110,6 +138,9 @@ export default {
         (key) => this.accessLevels[key] === Number(this.selectedAccessLevel),
       );
     },
+    contentSlots() {
+      return [...DEFAULT_SLOTS, ...(this.extraSlots || [])];
+    },
   },
   watch: {
     selectedAccessLevel: {
@@ -148,6 +179,7 @@ export default {
   READ_MORE_TEXT,
   INVITE_BUTTON_TEXT,
   CANCEL_BUTTON_TEXT,
+  DEFAULT_SLOT,
 };
 </script>
 
@@ -164,6 +196,13 @@ export default {
     @close="reset"
     @hide="reset"
   >
+    <content-transition
+      class="gl-display-grid"
+      transition-name="invite-modal-transition"
+      :slots="contentSlots"
+      :current-slot="currentSlot"
+    >
+      <template #[$options.DEFAULT_SLOT]>
         <div class="gl-display-flex" data-testid="modal-base-intro-text">
           <slot name="intro-text-before"></slot>
           <p>
@@ -227,16 +266,26 @@ export default {
             :target="null"
           >
             <template #default="{ formattedDate }">
-          <gl-form-input class="gl-w-full" :value="formattedDate" :placeholder="__(`YYYY-MM-DD`)" />
+              <gl-form-input
+                class="gl-w-full"
+                :value="formattedDate"
+                :placeholder="__(`YYYY-MM-DD`)"
+              />
             </template>
           </gl-datepicker>
         </div>
         <slot name="form-after"></slot>
-
+      </template>
+      <template v-for="{ key } in extraSlots" #[key]>
+        <slot :name="key"></slot>
+      </template>
+    </content-transition>
     <template #modal-footer>
+      <slot name="cancel-button">
         <gl-button data-testid="cancel-button" @click="closeModal">
           {{ $options.CANCEL_BUTTON_TEXT }}
         </gl-button>
+      </slot>
       <gl-button
         :disabled="submitDisabled"
         :loading="isLoading"
@@ -245,7 +294,7 @@ export default {
         data-testid="invite-button"
         @click="submit"
       >
-        {{ $options.INVITE_BUTTON_TEXT }}
+        {{ submitButtonText }}
       </gl-button>
     </template>
   </gl-modal>

app/assets/javascripts/vue_shared/components/content_transition.vue

+<script>
+export default {
+  props: {
+    currentSlot: {
+      type: String,
+      required: true,
+    },
+    slots: {
+      type: Array,
+      required: true,
+    },
+    transitionName: {
+      type: String,
+      required: true,
+    },
+  },
+  methods: {
+    shouldShow(key) {
+      return this.currentSlot === key;
+    },
+  },
+};
+</script>
+<template>
+  <div>
+    <transition v-for="{ key, attributes } in slots" :key="key" :name="transitionName">
+      <div v-show="shouldShow(key)" v-bind="attributes">
+        <slot :name="key"></slot>
+      </div>
+    </transition>
+  </div>
+</template>

ee/app/assets/javascripts/invite_members/components/invite_modal_base.vue

 <script>
-import {
-  GlFormGroup,
-  GlModal,
-  GlDropdown,
-  GlDropdownItem,
-  GlDatepicker,
-  GlLink,
-  GlSprintf,
-  GlButton,
-  GlFormInput,
-} from '@gitlab/ui';
-import { sprintf } from '~/locale';
+import { GlLink, GlButton } from '@gitlab/ui';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import {
-  ACCESS_LEVEL,
-  ACCESS_EXPIRE_DATE,
-  READ_MORE_TEXT,
-  INVITE_BUTTON_TEXT,
-  CANCEL_BUTTON_TEXT,
-  HEADER_CLOSE_LABEL,
-} from '~/invite_members/constants';
+import InviteModalBase from '~/invite_members/components/invite_modal_base.vue';
 import {
   OVERAGE_MODAL_LINK,
   OVERAGE_MODAL_TITLE,
@@ -30,73 +12,34 @@ import {
   overageModalInfoWarning,
 } from '../constants';
 
+const OVERAGE_CONTENT_SLOT = 'overage-content';
+const EXTRA_SLOTS = [
+  {
+    key: OVERAGE_CONTENT_SLOT,
+    attributes: {
+      class: 'invite-modal-content',
+      'data-testid': 'invite-modal-overage-content',
+    },
+  },
+];
+
 export default {
   components: {
-    GlFormGroup,
-    GlDatepicker,
     GlLink,
-    GlModal,
-    GlDropdown,
-    GlDropdownItem,
-    GlSprintf,
     GlButton,
-    GlFormInput,
+    InviteModalBase,
   },
   mixins: [glFeatureFlagsMixin()],
   inheritAttrs: false,
   props: {
-    modalTitle: {
-      type: String,
-      required: true,
-    },
-    modalId: {
-      type: String,
-      required: true,
-    },
     name: {
       type: String,
       required: true,
     },
-    accessLevels: {
-      type: Object,
-      required: true,
-    },
-    defaultAccessLevel: {
-      type: Number,
-      required: true,
-    },
-    helpLink: {
-      type: String,
-      required: true,
-    },
-    labelIntroText: {
-      type: String,
-      required: true,
-    },
-    labelSearchField: {
+    modalTitle: {
       type: String,
       required: true,
     },
-    formGroupDescription: {
-      type: String,
-      required: false,
-      default: '',
-    },
-    submitDisabled: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    isLoading: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    invalidFeedbackMessage: {
-      type: String,
-      required: false,
-      default: '',
-    },
     subscriptionSeats: {
       type: Number,
       required: false,
@@ -104,29 +47,19 @@ export default {
     },
   },
   data() {
-    // Be sure to check out reset!
     return {
-      selectedAccessLevel: this.defaultAccessLevel,
-      selectedDate: undefined,
-      minDate: new Date(),
       hasOverage: false,
       totalUserCount: null,
     };
   },
   computed: {
-    introText() {
-      return sprintf(this.labelIntroText, { name: this.name });
-    },
-    validationState() {
-      return this.invalidFeedbackMessage ? false : null;
-    },
-    selectLabelId() {
-      return `${this.modalId}_select`;
-    },
-    selectedRoleName() {
-      return Object.keys(this.accessLevels).find(
-        (key) => this.accessLevels[key] === Number(this.selectedAccessLevel),
-      );
+    currentSlot() {
+      if (this.showOverageModal) {
+        return OVERAGE_CONTENT_SLOT;
+      }
+
+      // Use CE default
+      return undefined;
     },
     showOverageModal() {
       return this.hasOverage && this.enabledOverageCheck;
@@ -136,220 +69,91 @@ export default {
     },
     modalInfo() {
       if (this.totalUserCount) {
-        const infoText = this.$options.i18n.infoText(this.subscriptionSeats);
-        const infoWarning = this.$options.i18n.infoWarning(this.totalUserCount, this.name);
+        const infoText = overageModalInfoText(this.subscriptionSeats);
+        const infoWarning = overageModalInfoWarning(this.totalUserCount, this.name);
 
         return `${infoText} ${infoWarning}`;
       }
       return '';
     },
-    modalTitleLabel() {
-      return this.showOverageModal ? this.$options.i18n.OVERAGE_MODAL_TITLE : this.modalTitle;
-    },
-  },
-  watch: {
-    selectedAccessLevel: {
-      immediate: true,
-      handler(val) {
-        this.$emit('access-level', val);
+    modalTitleOverride() {
+      return this.showOverageModal ? OVERAGE_MODAL_TITLE : this.modalTitle;
     },
+    submitButtonText() {
+      if (this.showOverageModal) {
+        return OVERAGE_MODAL_CONTINUE_BUTTON;
+      }
+
+      // Use CE default
+      return undefined;
     },
   },
   methods: {
-    reset() {
-      // This component isn't necessarily disposed,
-      // so we might need to reset it's state.
-      this.selectedAccessLevel = this.defaultAccessLevel;
-      this.selectedDate = undefined;
+    getPassthroughListeners() {
+      // This gets the listeners we don't manually handle here
+      // so we can pass them through to the CE invite_modal_base.vue
+      const { reset, submit, ...listeners } = this.$listeners;
 
+      return listeners;
+    },
+    onReset(...args) {
       // don't reopen the overage modal
       this.hasOverage = false;
 
-      this.$emit('reset');
-    },
-    closeModal() {
-      this.reset();
-      this.$refs.modal.hide();
-    },
-    changeSelectedItem(item) {
-      this.selectedAccessLevel = item;
+      this.$emit('reset', ...args);
     },
-    submit() {
-      this.$emit('submit', {
-        accessLevel: this.selectedAccessLevel,
-        expiresAt: this.selectedDate,
-      });
-    },
-    checkOverage() {
-      // add a more complex check in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78287
-      // totalUserCount should be calculated there
-      if (this.enabledOverageCheck) {
+    onSubmit(...args) {
+      if (this.enabledOverageCheck && !this.hasOverage) {
         this.totalUserCount = 1;
         this.hasOverage = true;
       } else {
-        this.submit();
+        this.$emit('submit', ...args);
       }
     },
     handleBack() {
       this.hasOverage = false;
     },
+    passthroughSlotNames() {
+      return Object.keys(this.$scopedSlots || {});
+    },
   },
   i18n: {
-    HEADER_CLOSE_LABEL,
-    ACCESS_EXPIRE_DATE,
-    ACCESS_LEVEL,
-    READ_MORE_TEXT,
-    INVITE_BUTTON_TEXT,
-    CANCEL_BUTTON_TEXT,
     OVERAGE_MODAL_TITLE,
     OVERAGE_MODAL_LINK,
     OVERAGE_MODAL_BACK_BUTTON,
     OVERAGE_MODAL_CONTINUE_BUTTON,
     OVERAGE_MODAL_LINK_TEXT,
-    infoText: overageModalInfoText,
-    infoWarning: overageModalInfoWarning,
   },
+  OVERAGE_CONTENT_SLOT,
+  EXTRA_SLOTS,
 };
 </script>
 
 <template>
-  <gl-modal
-    ref="modal"
-    :modal-id="modalId"
-    data-qa-selector="invite_members_modal_content"
-    data-testid="invite-modal"
-    size="sm"
-    :title="modalTitleLabel"
-    :header-close-label="$options.i18n.HEADER_CLOSE_LABEL"
-    @hidden="reset"
-    @close="reset"
-    @hide="reset"
-  >
-    <div class="gl-display-grid">
-      <transition name="invite-modal-transition">
-        <div
-          v-show="!showOverageModal"
-          class="invite-modal-content"
-          data-testid="invite-modal-initial-content"
-        >
-          <div class="gl-display-flex" data-testid="modal-base-intro-text">
-            <slot name="intro-text-before"></slot>
-            <p>
-              <gl-sprintf :message="introText">
-                <template #strong="{ content }">
-                  <strong>{{ content }}</strong>
-                </template>
-              </gl-sprintf>
-            </p>
-            <slot name="intro-text-after"></slot>
-          </div>
-
-          <gl-form-group
-            :invalid-feedback="invalidFeedbackMessage"
-            :state="validationState"
-            :description="formGroupDescription"
-            data-testid="members-form-group"
-          >
-            <label :id="selectLabelId" class="col-form-label">{{ labelSearchField }}</label>
-            <slot name="select" v-bind="{ validationState, labelId: selectLabelId }"></slot>
-          </gl-form-group>
-
-          <label class="gl-font-weight-bold">{{ $options.i18n.ACCESS_LEVEL }}</label>
-          <div class="gl-mt-2 gl-w-half gl-xs-w-full">
-            <gl-dropdown
-              class="gl-shadow-none gl-w-full"
-              data-qa-selector="access_level_dropdown"
+  <invite-modal-base
     v-bind="$attrs"
-              :text="selectedRoleName"
-            >
-              <template v-for="(key, item) in accessLevels">
-                <gl-dropdown-item
-                  :key="key"
-                  active-class="is-active"
-                  is-check-item
-                  :is-checked="key === selectedAccessLevel"
-                  @click="changeSelectedItem(key)"
-                >
-                  <div>{{ item }}</div>
-                </gl-dropdown-item>
-              </template>
-            </gl-dropdown>
-          </div>
-
-          <div class="gl-mt-2 gl-w-half gl-xs-w-full">
-            <gl-sprintf :message="$options.i18n.READ_MORE_TEXT">
-              <template #link="{ content }">
-                <gl-link :href="helpLink" target="_blank">{{ content }}</gl-link>
-              </template>
-            </gl-sprintf>
-          </div>
-
-          <label class="gl-mt-5 gl-display-block" for="expires_at">{{
-            $options.i18n.ACCESS_EXPIRE_DATE
-          }}</label>
-          <div class="gl-mt-2 gl-w-half gl-xs-w-full gl-display-inline-block">
-            <gl-datepicker
-              v-model="selectedDate"
-              class="gl-display-inline!"
-              :min-date="minDate"
-              :target="null"
-            >
-              <template #default="{ formattedDate }">
-                <gl-form-input
-                  class="gl-w-full"
-                  :value="formattedDate"
-                  :placeholder="__(`YYYY-MM-DD`)"
-                />
-              </template>
-            </gl-datepicker>
-          </div>
-          <slot name="form-after"></slot>
-        </div>
-      </transition>
-      <transition name="invite-modal-transition">
-        <div
-          v-show="showOverageModal"
-          class="invite-modal-content"
-          data-testid="invite-modal-overage-content"
+    :name="name"
+    :submit-button-text="submitButtonText"
+    :modal-title="modalTitleOverride"
+    :current-slot="currentSlot"
+    :extra-slots="$options.EXTRA_SLOTS"
+    @reset="onReset"
+    @submit="onSubmit"
+    v-on="getPassthroughListeners()"
   >
+    <template #[$options.OVERAGE_CONTENT_SLOT]>
       {{ modalInfo }}
       <gl-link :href="$options.i18n.OVERAGE_MODAL_LINK" target="_blank">{{
         $options.i18n.OVERAGE_MODAL_LINK_TEXT
       }}</gl-link>
-        </div>
-      </transition>
-    </div>
-    <template #modal-footer>
-      <template v-if="!showOverageModal">
-        <gl-button data-testid="cancel-button" @click="closeModal">
-          {{ $options.i18n.CANCEL_BUTTON_TEXT }}
-        </gl-button>
-        <gl-button
-          :disabled="submitDisabled"
-          :loading="isLoading"
-          variant="confirm"
-          data-qa-selector="invite_button"
-          data-testid="invite-button"
-          @click="checkOverage"
-        >
-          {{ $options.i18n.INVITE_BUTTON_TEXT }}
-        </gl-button>
     </template>
-      <template v-else>
+    <template v-if="enabledOverageCheck && hasOverage" #cancel-button>
       <gl-button data-testid="overage-back-button" @click="handleBack">
         {{ $options.i18n.OVERAGE_MODAL_BACK_BUTTON }}
       </gl-button>
-        <gl-button
-          :disabled="submitDisabled"
-          :loading="isLoading"
-          variant="confirm"
-          data-qa-selector="invite_with_overage_button"
-          data-testid="invite-with-overage-button"
-          @click="submit"
-        >
-          {{ $options.i18n.OVERAGE_MODAL_CONTINUE_BUTTON }}
-        </gl-button>
     </template>
+    <template v-for="(_, slot) of $scopedSlots" #[slot]="scope">
+      <slot :name="slot" v-bind="scope"></slot>
     </template>
-  </gl-modal>
+  </invite-modal-base>
 </template>

ee/spec/frontend/invite_members/components/invite_modal_base_spec.js

-import {
-  GlDropdown,
-  GlDropdownItem,
-  GlDatepicker,
-  GlFormGroup,
-  GlSprintf,
-  GlLink,
-  GlModal,
-} from '@gitlab/ui';
+import { GlModal, GlSprintf } from '@gitlab/ui';
+import { nextTick } from 'vue';
 import { stubComponent } from 'helpers/stub_component';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import InviteModalBase from 'ee_else_ce/invite_members/components/invite_modal_base.vue';
-import { CANCEL_BUTTON_TEXT, INVITE_BUTTON_TEXT } from '~/invite_members/constants';
+import ContentTransition from '~/vue_shared/components/content_transition.vue';
+import CEInviteModalBase from '~/invite_members/components/invite_modal_base.vue';
+import EEInviteModalBase from 'ee/invite_members/components/invite_modal_base.vue';
 import {
   OVERAGE_MODAL_TITLE,
   OVERAGE_MODAL_CONTINUE_BUTTON,
@@ -18,11 +12,12 @@ import {
 } from 'ee/invite_members/constants';
 import { propsData } from 'jest/invite_members/mock_data/modal_base';
 
-describe('InviteModalBase', () => {
+describe('EEInviteModalBase', () => {
   let wrapper;
+  let listenerSpy;
 
   const createComponent = (props = {}, glFeatures = {}) => {
-    wrapper = shallowMountExtended(InviteModalBase, {
+    wrapper = shallowMountExtended(EEInviteModalBase, {
       propsData: {
         ...propsData,
         ...props,
@@ -31,125 +26,103 @@ describe('InviteModalBase', () => {
         ...glFeatures,
       },
       stubs: {
+        GlSprintf,
+        InviteModalBase: CEInviteModalBase,
+        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', 'description'],
-        }),
+      },
+      listeners: {
+        submit: (...args) => listenerSpy('submit', ...args),
+        reset: (...args) => listenerSpy('reset', ...args),
+        foo: (...args) => listenerSpy('foo', ...args),
       },
     });
   };
 
+  beforeEach(() => {
+    listenerSpy = jest.fn();
+  });
+
   afterEach(() => {
     wrapper.destroy();
     wrapper = null;
   });
 
-  const findDropdown = () => wrapper.findComponent(GlDropdown);
-  const findDropdownItems = () => findDropdown().findAllComponents(GlDropdownItem);
-  const findDatepicker = () => wrapper.findComponent(GlDatepicker);
-  const findLink = () => wrapper.findComponent(GlLink);
-  const findIntroText = () => wrapper.findByTestId('modal-base-intro-text').text();
-  const findCancelButton = () => wrapper.findByTestId('cancel-button');
+  const findCEBase = () => wrapper.findComponent(CEInviteModalBase);
   const findInviteButton = () => wrapper.findByTestId('invite-button');
   const findBackButton = () => wrapper.findByTestId('overage-back-button');
-  const findOverageInviteButton = () => wrapper.findByTestId('invite-with-overage-button');
   const findInitialModalContent = () => wrapper.findByTestId('invite-modal-initial-content');
   const findOverageModalContent = () => wrapper.findByTestId('invite-modal-overage-content');
-  const findMembersFormGroup = () => wrapper.findByTestId('members-form-group');
+  const findModalTitle = () => wrapper.findComponent(GlModal).props('title');
 
   const clickInviteButton = () => findInviteButton().vm.$emit('click');
   const clickBackButton = () => findBackButton().vm.$emit('click');
 
-  describe('rendering the modal', () => {
+  describe('default', () => {
     beforeEach(() => {
       createComponent();
     });
 
-    it('renders the modal with the correct title', () => {
-      expect(wrapper.findComponent(GlModal).props('title')).toBe(propsData.modalTitle);
-    });
-
-    it('displays the introText', () => {
-      expect(findIntroText()).toBe(propsData.labelIntroText);
-    });
-
-    it('renders the Cancel button text correctly', () => {
-      expect(findCancelButton().text()).toBe(CANCEL_BUTTON_TEXT);
+    it('passes attrs to CE base', () => {
+      expect(findCEBase().props()).toMatchObject({
+        ...propsData,
+        currentSlot: 'default',
+        extraSlots: EEInviteModalBase.EXTRA_SLOTS,
       });
-
-    it('renders the Invite button text correctly', () => {
-      expect(findInviteButton().text()).toBe(INVITE_BUTTON_TEXT);
     });
 
-    it('renders the Invite button modal without isLoading', () => {
-      expect(findInviteButton().props('loading')).toBe(false);
-    });
-
-    describe('rendering the access levels dropdown', () => {
-      it('sets the default dropdown text to the default access level name', () => {
-        expect(findDropdown().attributes('text')).toBe('Guest');
+    it("doesn't show the overage content", () => {
+      expect(findOverageModalContent().isVisible()).toBe(false);
     });
 
-      it('renders dropdown items for each accessLevel', () => {
-        expect(findDropdownItems()).toHaveLength(5);
-      });
-    });
+    it('when reset is emitted on base, emits reset', () => {
+      expect(wrapper.emitted('reset')).toBeUndefined();
 
-    it('renders the correct link', () => {
-      expect(findLink().attributes('href')).toBe(propsData.helpLink);
-    });
+      findCEBase().vm.$emit('reset');
 
-    it('renders the datepicker', () => {
-      expect(findDatepicker().exists()).toBe(true);
+      expect(wrapper.emitted('reset')).toHaveLength(1);
     });
 
-    it("doesn't show the overage content", () => {
-      expect(findOverageModalContent().isVisible()).toBe(false);
+    describe('(integration) when invite is clicked', () => {
+      beforeEach(async () => {
+        clickInviteButton();
+        await nextTick();
       });
 
-    it('renders the members form group', () => {
-      expect(findMembersFormGroup().props()).toEqual({
-        description: propsData.formGroupDescription,
-        invalidFeedback: '',
-        state: null,
-      });
-    });
+      it('does not change title', () => {
+        expect(findModalTitle()).toBe(propsData.modalTitle);
       });
 
-  it('with isLoading, shows loading for invite button', () => {
-    createComponent({
-      isLoading: true,
+      it('does not show back button', () => {
+        expect(findBackButton().exists()).toBe(false);
       });
 
-    expect(findInviteButton().props('loading')).toBe(true);
+      it('shows initial modal content', () => {
+        expect(findInitialModalContent().isVisible()).toBe(true);
       });
 
-  it('with invalidFeedbackMessage, set members form group validation state', () => {
-    createComponent({
-      invalidFeedbackMessage: 'invalid message!',
+      it('emits submit', () => {
+        expect(wrapper.emitted('submit')).toEqual([[{ accessLevel: 10, expiresAt: undefined }]]);
       });
-
-    expect(findMembersFormGroup().props()).toEqual({
-      description: propsData.formGroupDescription,
-      invalidFeedback: 'invalid message!',
-      state: false,
     });
   });
 
-  describe('displays overage modal', () => {
-    beforeEach(() => {
+  describe('with overageMembersModal feature flag, and invite is clicked ', () => {
+    beforeEach(async () => {
       createComponent({}, { glFeatures: { overageMembersModal: true } });
       clickInviteButton();
+      await nextTick();
+    });
+
+    it('does not emit submit', () => {
+      expect(wrapper.emitted().submit).toBeUndefined();
     });
 
     it('renders the modal with the correct title', () => {
-      expect(wrapper.findComponent(GlModal).props('title')).toBe(OVERAGE_MODAL_TITLE);
+      expect(findModalTitle()).toBe(OVERAGE_MODAL_TITLE);
     });
 
     it('renders the Back button text correctly', () => {
@@ -157,7 +130,7 @@ describe('InviteModalBase', () => {
     });
 
     it('renders the Continue button text correctly', () => {
-      expect(findOverageInviteButton().text()).toBe(OVERAGE_MODAL_CONTINUE_BUTTON);
+      expect(findInviteButton().text()).toBe(OVERAGE_MODAL_CONTINUE_BUTTON);
     });
 
     it('shows the info text', () => {
@@ -174,7 +147,7 @@ describe('InviteModalBase', () => {
       beforeEach(() => clickBackButton());
 
       it('shows the initial modal', () => {
-        expect(wrapper.findComponent(GlModal).props('title')).toBe('_modal_title_');
+        expect(wrapper.findComponent(GlModal).props('title')).toBe(propsData.modalTitle);
         expect(findInitialModalContent().isVisible()).toBe(true);
       });
 

spec/frontend/invite_members/components/invite_groups_modal_spec.js

@@ -4,6 +4,7 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import Api from '~/api';
 import InviteGroupsModal from '~/invite_members/components/invite_groups_modal.vue';
 import InviteModalBase from '~/invite_members/components/invite_modal_base.vue';
+import ContentTransition from '~/vue_shared/components/content_transition.vue';
 import GroupSelect from '~/invite_members/components/group_select.vue';
 import { stubComponent } from 'helpers/stub_component';
 import { propsData, sharedGroup } from '../mock_data/group_modal';
@@ -19,6 +20,7 @@ describe('InviteGroupsModal', () => {
       },
       stubs: {
         InviteModalBase,
+        ContentTransition,
         GlSprintf,
         GlModal: stubComponent(GlModal, {
           template: '<div><slot></slot><slot name="modal-footer"></slot></div>',

spec/frontend/invite_members/components/invite_members_modal_spec.js

@@ -19,6 +19,7 @@ import {
   LEARN_GITLAB,
 } from '~/invite_members/constants';
 import eventHub from '~/invite_members/event_hub';
+import ContentTransition from '~/vue_shared/components/content_transition.vue';
 import axios from '~/lib/utils/axios_utils';
 import httpStatus from '~/lib/utils/http_status';
 import { getParameterValues } from '~/lib/utils/url_utility';
@@ -55,6 +56,7 @@ describe('InviteMembersModal', () => {
       },
       stubs: {
         InviteModalBase,
+        ContentTransition,
         GlSprintf,
         GlModal: stubComponent(GlModal, {
           template: '<div><slot></slot><slot name="modal-footer"></slot></div>',

spec/frontend/invite_members/components/invite_modal_base_spec.js

@@ -10,6 +10,7 @@ import {
 import { stubComponent } from 'helpers/stub_component';
 import { 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';
 import { CANCEL_BUTTON_TEXT, INVITE_BUTTON_TEXT } from '~/invite_members/constants';
 import { propsData } from '../mock_data/modal_base';
 
@@ -23,6 +24,7 @@ describe('InviteModalBase', () => {
         ...props,
       },
       stubs: {
+        ContentTransition,
         GlModal: stubComponent(GlModal, {
           template:
             '<div><slot name="modal-title"></slot><slot></slot><slot name="modal-footer"></slot></div>',