4 files changed, 9 insertions, 15 deletions

diff --git a/spec/frontend/design_management/pages/index_spec.js b/spec/frontend/design_management/pages/index_spec.js
index 961ea27f0f4..9b5e812c021 100644
--- a/spec/frontend/design_management/pages/index_spec.js
+++ b/spec/frontend/design_management/pages/index_spec.js
@@ -191,7 +191,7 @@ describe('Design management index page', () => {
       [moveDesignMutation, moveDesignHandler],
     ];
 
-    fakeApollo = createMockApollo(requestHandlers, {}, { addTypename: true });
+    fakeApollo = createMockApollo(requestHandlers, {});
     wrapper = shallowMountExtended(Index, {
       apolloProvider: fakeApollo,
       router,
diff --git a/spec/frontend/super_sidebar/components/user_name_group_spec.js b/spec/frontend/super_sidebar/components/user_menu_profile_item_spec.js
index a31ad93d143..9cf55154a59 100644
--- a/spec/frontend/super_sidebar/components/user_name_group_spec.js
+++ b/spec/frontend/super_sidebar/components/user_menu_profile_item_spec.js
@@ -1,12 +1,11 @@
-import { GlDisclosureDropdownGroup, GlDisclosureDropdownItem, GlTooltip } from '@gitlab/ui';
+import { GlDisclosureDropdownItem, GlTooltip } from '@gitlab/ui';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
-import UserNameGroup from '~/super_sidebar/components/user_name_group.vue';
+import UserMenuProfileItem from '~/super_sidebar/components/user_menu_profile_item.vue';
 import { userMenuMockData, userMenuMockStatus } from '../mock_data';
 
-describe('UserNameGroup component', () => {
+describe('UserMenuProfileItem component', () => {
   let wrapper;
 
-  const findGlDisclosureDropdownGroup = () => wrapper.findComponent(GlDisclosureDropdownGroup);
   const findGlDisclosureDropdownItem = () => wrapper.findComponent(GlDisclosureDropdownItem);
   const findGlTooltip = () => wrapper.findComponent(GlTooltip);
   const findUserStatus = () => wrapper.findByTestId('user-menu-status');
@@ -14,7 +13,7 @@ describe('UserNameGroup component', () => {
   const GlEmoji = { template: '<img/>' };
 
   const createWrapper = (userDataChanges = {}) => {
-    wrapper = shallowMountExtended(UserNameGroup, {
+    wrapper = shallowMountExtended(UserMenuProfileItem, {
       propsData: {
         user: {
           ...userMenuMockData,
@@ -32,10 +31,6 @@ describe('UserNameGroup component', () => {
     createWrapper();
   });
 
-  it('renders the menu item in a separate group', () => {
-    expect(findGlDisclosureDropdownGroup().exists()).toBe(true);
-  });
-
   it('renders menu item', () => {
     expect(findGlDisclosureDropdownItem().exists()).toBe(true);
   });
diff --git a/spec/frontend/super_sidebar/components/user_menu_spec.js b/spec/frontend/super_sidebar/components/user_menu_spec.js
index d41a414f69e..79a31492f3f 100644
--- a/spec/frontend/super_sidebar/components/user_menu_spec.js
+++ b/spec/frontend/super_sidebar/components/user_menu_spec.js
@@ -2,7 +2,7 @@ import { GlAvatar, GlDisclosureDropdown } from '@gitlab/ui';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import { stubComponent } from 'helpers/stub_component';
 import UserMenu from '~/super_sidebar/components/user_menu.vue';
-import UserNameGroup from '~/super_sidebar/components/user_name_group.vue';
+import UserMenuProfileItem from '~/super_sidebar/components/user_menu_profile_item.vue';
 import NewNavToggle from '~/nav/components/new_nav_toggle.vue';
 import invalidUrl from '~/lib/utils/invalid_url';
 import { mockTracking } from 'helpers/tracking_helper';
@@ -86,9 +86,9 @@ describe('UserMenu component', () => {
   describe('User Menu Group', () => {
     it('renders and passes data to it', () => {
       createWrapper();
-      const userNameGroup = wrapper.findComponent(UserNameGroup);
-      expect(userNameGroup.exists()).toBe(true);
-      expect(userNameGroup.props('user')).toEqual(userMenuMockData);
+      const userMenuProfileItem = wrapper.findComponent(UserMenuProfileItem);
+      expect(userMenuProfileItem.exists()).toBe(true);
+      expect(userMenuProfileItem.props('user')).toEqual(userMenuMockData);
     });
   });
 
diff --git a/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js b/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
index 111fb5d8458..0b88b3ff5b4 100644
--- a/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
+++ b/spec/frontend/work_items/components/work_item_links/work_item_links_spec.js
@@ -54,7 +54,6 @@ describe('WorkItemLinks', () => {
         [issueDetailsQuery, issueDetailsQueryHandler],
       ],
       resolvers,
-      { addTypename: true },
     );
 
     wrapper = shallowMountExtended(WorkItemLinks, {