Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

17 files changed, 142 insertions, 22 deletions

diff --git a/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js b/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js
index 71c9da238b4..6edfe9641b9 100644
--- a/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js
+++ b/spec/frontend/pages/admin/abuse_reports/abuse_reports_spec.js
@@ -1,5 +1,5 @@
 import $ from 'jquery';
-import '~/lib/utils/text_utility';
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import AbuseReports from '~/pages/admin/abuse_reports/abuse_reports';
 
 describe('Abuse Reports', () => {
@@ -15,11 +15,15 @@ describe('Abuse Reports', () => {
     $messages.filter((index, element) => element.innerText.indexOf(searchText) > -1).first();
 
   beforeEach(() => {
-    loadFixtures(FIXTURE);
+    loadHTMLFixture(FIXTURE);
     new AbuseReports(); // eslint-disable-line no-new
     $messages = $('.abuse-reports .message');
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   it('should truncate long messages', () => {
     const $longMessage = findMessage('LONG MESSAGE');
 
diff --git a/spec/frontend/pages/admin/application_settings/account_and_limits_spec.js b/spec/frontend/pages/admin/application_settings/account_and_limits_spec.js
index 3a4f93d4464..542eb2f3ab8 100644
--- a/spec/frontend/pages/admin/application_settings/account_and_limits_spec.js
+++ b/spec/frontend/pages/admin/application_settings/account_and_limits_spec.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import initUserInternalRegexPlaceholder, {
   PLACEHOLDER_USER_EXTERNAL_DEFAULT_FALSE,
   PLACEHOLDER_USER_EXTERNAL_DEFAULT_TRUE,
@@ -10,12 +11,16 @@ describe('AccountAndLimits', () => {
   let $userInternalRegex;
 
   beforeEach(() => {
-    loadFixtures(FIXTURE);
+    loadHTMLFixture(FIXTURE);
     initUserInternalRegexPlaceholder();
     $userDefaultExternal = $('#application_setting_user_default_external');
     $userInternalRegex = document.querySelector('#application_setting_user_default_internal_regex');
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   describe('Changing of userInternalRegex when userDefaultExternal', () => {
     it('is unchecked', () => {
       expect($userDefaultExternal.prop('checked')).toBeFalsy();
diff --git a/spec/frontend/pages/admin/application_settings/metrics_and_profiling/usage_statistics_spec.js b/spec/frontend/pages/admin/application_settings/metrics_and_profiling/usage_statistics_spec.js
index 4140b985682..3a52c243867 100644
--- a/spec/frontend/pages/admin/application_settings/metrics_and_profiling/usage_statistics_spec.js
+++ b/spec/frontend/pages/admin/application_settings/metrics_and_profiling/usage_statistics_spec.js
@@ -2,6 +2,7 @@ import initSetHelperText, {
   HELPER_TEXT_SERVICE_PING_DISABLED,
   HELPER_TEXT_SERVICE_PING_ENABLED,
 } from '~/pages/admin/application_settings/metrics_and_profiling/usage_statistics';
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 
 describe('UsageStatistics', () => {
   const FIXTURE = 'application_settings/usage.html';
@@ -11,7 +12,7 @@ describe('UsageStatistics', () => {
   let servicePingFeaturesHelperText;
 
   beforeEach(() => {
-    loadFixtures(FIXTURE);
+    loadHTMLFixture(FIXTURE);
     initSetHelperText();
     servicePingCheckBox = document.getElementById('application_setting_usage_ping_enabled');
     servicePingFeaturesCheckBox = document.getElementById(
@@ -21,6 +22,10 @@ describe('UsageStatistics', () => {
     servicePingFeaturesHelperText = document.getElementById('service_ping_features_helper_text');
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   const expectEnabledservicePingFeaturesCheckBox = () => {
     expect(servicePingFeaturesCheckBox.classList.contains('gl-cursor-not-allowed')).toBe(false);
     expect(servicePingFeaturesHelperText.textContent).toEqual(HELPER_TEXT_SERVICE_PING_ENABLED);
diff --git a/spec/frontend/pages/admin/projects/components/namespace_select_spec.js b/spec/frontend/pages/admin/projects/components/namespace_select_spec.js
index f10b202f4d7..909349569a8 100644
--- a/spec/frontend/pages/admin/projects/components/namespace_select_spec.js
+++ b/spec/frontend/pages/admin/projects/components/namespace_select_spec.js
@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils';
 import { nextTick } from 'vue';
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import Api from '~/api';
 import NamespaceSelect from '~/pages/admin/projects/components/namespace_select.vue';
 
@@ -26,7 +27,7 @@ describe('Dropdown select component', () => {
   };
 
   beforeEach(() => {
-    setFixtures('<div class="test-container"></div>');
+    setHTMLFixture('<div class="test-container"></div>');
 
     jest.spyOn(Api, 'namespaces').mockImplementation((_, callback) =>
       callback([
@@ -36,6 +37,10 @@ describe('Dropdown select component', () => {
     );
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   it('creates a hidden input if fieldName is provided', () => {
     mountDropdown({ fieldName: 'namespace-input' });
 
diff --git a/spec/frontend/pages/dashboard/todos/index/todos_spec.js b/spec/frontend/pages/dashboard/todos/index/todos_spec.js
index ae53afa7fba..3a9b59f291c 100644
--- a/spec/frontend/pages/dashboard/todos/index/todos_spec.js
+++ b/spec/frontend/pages/dashboard/todos/index/todos_spec.js
@@ -1,5 +1,6 @@
 import MockAdapter from 'axios-mock-adapter';
 import $ from 'jquery';
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import waitForPromises from 'helpers/wait_for_promises';
 import '~/lib/utils/common_utils';
 import axios from '~/lib/utils/axios_utils';
@@ -19,7 +20,7 @@ describe('Todos', () => {
   let mock;
 
   beforeEach(() => {
-    loadFixtures('todos/todos.html');
+    loadHTMLFixture('todos/todos.html');
     todoItem = document.querySelector('.todos-list .todo');
     mock = new MockAdapter(axios);
 
@@ -27,6 +28,10 @@ describe('Todos', () => {
   });
 
   afterEach(() => {
+    resetHTMLFixture();
+  });
+
+  afterEach(() => {
     mock.restore();
   });
 
diff --git a/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js b/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js
index 43c48617800..a850b1655f7 100644
--- a/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js
+++ b/spec/frontend/pages/import/bulk_imports/history/components/bulk_imports_history_app_spec.js
@@ -3,6 +3,7 @@ import { mount, shallowMount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import PaginationBar from '~/vue_shared/components/pagination_bar/pagination_bar.vue';
+import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
 import BulkImportsHistoryApp from '~/pages/import/bulk_imports/history/components/bulk_imports_history_app.vue';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
@@ -60,6 +61,8 @@ describe('BulkImportsHistoryApp', () => {
     wrapper = mountFn(BulkImportsHistoryApp);
   }
 
+  const findLocalStorageSync = () => wrapper.findComponent(LocalStorageSync);
+
   const originalApiVersion = gon.api_version;
   beforeAll(() => {
     gon.api_version = 'v4';
@@ -137,6 +140,20 @@ describe('BulkImportsHistoryApp', () => {
     );
   });
 
+  it('sets up the local storage sync correctly', async () => {
+    const NEW_PAGE_SIZE = 4;
+
+    mock.onGet(API_URL).reply(200, DUMMY_RESPONSE, DEFAULT_HEADERS);
+    createComponent();
+    await axios.waitForAll();
+    mock.resetHistory();
+
+    wrapper.findComponent(PaginationBar).vm.$emit('set-page-size', NEW_PAGE_SIZE);
+    await axios.waitForAll();
+
+    expect(findLocalStorageSync().props('value')).toBe(NEW_PAGE_SIZE);
+  });
+
   it('renders correct url for destination group when relative_url is empty', async () => {
     mock.onGet(API_URL).reply(200, DUMMY_RESPONSE, DEFAULT_HEADERS);
     createComponent({ shallow: false });
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
index 269c7467c8b..005b8968383 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
+++ b/spec/frontend/pages/projects/learn_gitlab/components/__snapshots__/learn_gitlab_spec.js.snap
@@ -178,7 +178,8 @@ exports[`Learn GitLab renders correctly 1`] = `
                 data-track-action="click_link"
                 data-track-label="Start a free Ultimate trial"
                 href="http://example.com/"
-                target="_self"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 
       Start a free Ultimate trial
@@ -209,7 +210,8 @@ exports[`Learn GitLab renders correctly 1`] = `
                 data-track-action="click_link"
                 data-track-label="Add code owners"
                 href="http://example.com/"
-                target="_self"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 
       Add code owners
@@ -240,7 +242,8 @@ exports[`Learn GitLab renders correctly 1`] = `
                 data-track-action="click_link"
                 data-track-label="Add merge request approval"
                 href="http://example.com/"
-                target="_self"
+                rel="noopener noreferrer"
+                target="_blank"
               >
                 
       Add merge request approval
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_section_link_spec.js b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_section_link_spec.js
index b8ebf2a1430..d9aff37f703 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_section_link_spec.js
+++ b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_section_link_spec.js
@@ -1,8 +1,11 @@
+import { GlPopover, GlLink } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
+import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import { stubExperiments } from 'helpers/experimentation_helper';
 import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper';
 import eventHub from '~/invite_members/event_hub';
 import LearnGitlabSectionLink from '~/pages/projects/learn_gitlab/components/learn_gitlab_section_link.vue';
+import { ACTION_LABELS } from '~/pages/projects/learn_gitlab/constants';
 
 const defaultAction = 'gitWrite';
 const defaultProps = {
@@ -10,6 +13,7 @@ const defaultProps = {
   description: 'Some description',
   url: 'https://example.com',
   completed: false,
+  enabled: true,
 };
 
 const openInNewTabProps = {
@@ -26,16 +30,21 @@ describe('Learn GitLab Section Link', () => {
   });
 
   const createWrapper = (action = defaultAction, props = {}) => {
-    wrapper = mount(LearnGitlabSectionLink, {
-      propsData: { action, value: { ...defaultProps, ...props } },
-    });
+    wrapper = extendedWrapper(
+      mount(LearnGitlabSectionLink, {
+        propsData: { action, value: { ...defaultProps, ...props } },
+      }),
+    );
   };
 
   const openInviteMembesrModalLink = () =>
     wrapper.find('[data-testid="invite-for-help-continuous-onboarding-experiment-link"]');
 
   const findUncompletedLink = () => wrapper.find('[data-testid="uncompleted-learn-gitlab-link"]');
-
+  const findDisabledLink = () => wrapper.findByTestId('disabled-learn-gitlab-link');
+  const findPopoverTrigger = () => wrapper.findByTestId('contact-admin-popover-trigger');
+  const findPopover = () => wrapper.findComponent(GlPopover);
+  const findPopoverLink = () => findPopover().findComponent(GlLink);
   const videoTutorialLink = () => wrapper.find('[data-testid="video-tutorial-link"]');
 
   it('renders no icon when not completed', () => {
@@ -62,6 +71,36 @@ describe('Learn GitLab Section Link', () => {
     expect(wrapper.find('[data-testid="trial-only"]').exists()).toBe(true);
   });
 
+  describe('disabled links', () => {
+    beforeEach(() => {
+      createWrapper('trialStarted', { enabled: false });
+    });
+
+    it('renders text without a link', () => {
+      expect(findDisabledLink().exists()).toBe(true);
+      expect(findDisabledLink().text()).toBe(ACTION_LABELS.trialStarted.title);
+      expect(findDisabledLink().attributes('href')).toBeUndefined();
+    });
+
+    it('renders a popover trigger with question icon', () => {
+      expect(findPopoverTrigger().exists()).toBe(true);
+      expect(findPopoverTrigger().props('icon')).toBe('question-o');
+    });
+
+    it('renders a popover', () => {
+      expect(findPopoverTrigger().attributes('id')).toBe(findPopover().props('target'));
+      expect(findPopover().props()).toMatchObject({
+        placement: 'top',
+        triggers: 'hover focus',
+      });
+    });
+
+    it('renders a link inside the popover', () => {
+      expect(findPopoverLink().exists()).toBe(true);
+      expect(findPopoverLink().attributes('href')).toBe(defaultProps.url);
+    });
+  });
+
   describe('links marked with openInNewTab', () => {
     beforeEach(() => {
       createWrapper('securityScanEnabled', openInNewTabProps);
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_spec.js b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_spec.js
index 5f1aff99578..0f63c243342 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_spec.js
+++ b/spec/frontend/pages/projects/learn_gitlab/components/learn_gitlab_spec.js
@@ -1,6 +1,6 @@
 import { GlProgressBar, GlAlert } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
-import Cookies from 'js-cookie';
+import Cookies from '~/lib/utils/cookies';
 import LearnGitlab from '~/pages/projects/learn_gitlab/components/learn_gitlab.vue';
 import eventHub from '~/invite_members/event_hub';
 import { INVITE_MODAL_OPEN_COOKIE } from '~/pages/projects/learn_gitlab/constants';
diff --git a/spec/frontend/pages/projects/learn_gitlab/components/mock_data.js b/spec/frontend/pages/projects/learn_gitlab/components/mock_data.js
index 5dc64097d81..1c29c68d2a9 100644
--- a/spec/frontend/pages/projects/learn_gitlab/components/mock_data.js
+++ b/spec/frontend/pages/projects/learn_gitlab/components/mock_data.js
@@ -3,47 +3,56 @@ export const testActions = {
     url: 'http://example.com/',
     completed: true,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
   },
   userAdded: {
     url: 'http://example.com/',
     completed: true,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
   },
   pipelineCreated: {
     url: 'http://example.com/',
     completed: false,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
   },
   trialStarted: {
     url: 'http://example.com/',
     completed: false,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
   },
   codeOwnersEnabled: {
     url: 'http://example.com/',
     completed: false,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
   },
   requiredMrApprovalsEnabled: {
     url: 'http://example.com/',
     completed: false,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
   },
   mergeRequestCreated: {
     url: 'http://example.com/',
     completed: false,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
   },
   securityScanEnabled: {
     url: 'https://docs.gitlab.com/ee/foobar/',
     completed: false,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
     openInNewTab: true,
   },
   issueCreated: {
     url: 'http://example.com/',
     completed: false,
     svg: 'http://example.com/images/illustration.svg',
+    enabled: true,
   },
 };
 
diff --git a/spec/frontend/pages/projects/merge_requests/edit/check_form_state_spec.js b/spec/frontend/pages/projects/merge_requests/edit/check_form_state_spec.js
index ea49111760b..5c186441817 100644
--- a/spec/frontend/pages/projects/merge_requests/edit/check_form_state_spec.js
+++ b/spec/frontend/pages/projects/merge_requests/edit/check_form_state_spec.js
@@ -1,3 +1,4 @@
+import { setHTMLFixture, resetHTMLFixture } from 'jest/__helpers__/fixtures';
 import initCheckFormState from '~/pages/projects/merge_requests/edit/check_form_state';
 
 describe('Check form state', () => {
@@ -7,7 +8,7 @@ describe('Check form state', () => {
   let setDialogContent;
 
   beforeEach(() => {
-    setFixtures(`
+    setHTMLFixture(`
       <form class="merge-request-form">
         <input type="text" name="test" id="form-input"/>
       </form>`);
@@ -22,6 +23,8 @@ describe('Check form state', () => {
   afterEach(() => {
     beforeUnloadEvent.preventDefault.mockRestore();
     setDialogContent.mockRestore();
+
+    resetHTMLFixture();
   });
 
   it('shows confirmation dialog when there are unsaved changes', () => {
diff --git a/spec/frontend/pages/projects/pages_domains/form_spec.js b/spec/frontend/pages/projects/pages_domains/form_spec.js
index 55336596f30..e437121acd2 100644
--- a/spec/frontend/pages/projects/pages_domains/form_spec.js
+++ b/spec/frontend/pages/projects/pages_domains/form_spec.js
@@ -1,3 +1,4 @@
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import initForm from '~/pages/projects/pages_domains/form';
 
 const ENABLED_UNLESS_AUTO_SSL_CLASS = 'js-enabled-unless-auto-ssl';
@@ -17,7 +18,7 @@ describe('Page domains form', () => {
   const findUnlessAutoSsl = () => document.querySelector(`.${SHOW_UNLESS_AUTO_SSL_CLASS}`);
 
   const create = () => {
-    setFixtures(`
+    setHTMLFixture(`
       <form>
         <span
           class="${SSL_TOGGLE_CLASS}"
@@ -31,6 +32,10 @@ describe('Page domains form', () => {
     `);
   };
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   it('instantiates the toggle', () => {
     create();
     initForm();
diff --git a/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js b/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js
index c28a03b35d7..ca7f70f4434 100644
--- a/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js
+++ b/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js
@@ -1,7 +1,7 @@
 import { GlButton } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import Cookies from 'js-cookie';
 import { nextTick } from 'vue';
+import Cookies from '~/lib/utils/cookies';
 import PipelineSchedulesCallout from '~/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue';
 
 const cookieKey = 'pipeline_schedules_callout_dismissed';
diff --git a/spec/frontend/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js b/spec/frontend/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js
index b700c255e8c..42eeff89bf4 100644
--- a/spec/frontend/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js
+++ b/spec/frontend/pages/projects/pipeline_schedules/shared/components/timezone_dropdown_spec.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import TimezoneDropdown, {
   formatUtcOffset,
   formatTimezone,
@@ -25,13 +26,17 @@ describe('Timezone Dropdown', () => {
   describe('Initialize', () => {
     describe('with dropdown already loaded', () => {
       beforeEach(() => {
-        loadFixtures('pipeline_schedules/edit.html');
+        loadHTMLFixture('pipeline_schedules/edit.html');
         $wrapper = $('.dropdown');
         $inputEl = $('#schedule_cron_timezone');
         $inputEl.val('');
         $dropdownEl = $('.js-timezone-dropdown');
       });
 
+      afterEach(() => {
+        resetHTMLFixture();
+      });
+
       it('can take an $inputEl in the constructor', () => {
         initTimezoneDropdown();
 
@@ -86,7 +91,7 @@ describe('Timezone Dropdown', () => {
 
     describe('without dropdown loaded', () => {
       beforeEach(() => {
-        loadFixtures('pipeline_schedules/edit.html');
+        loadHTMLFixture('pipeline_schedules/edit.html');
         $wrapper = $('.dropdown');
         $inputEl = $('#schedule_cron_timezone');
         $dropdownEl = $('.js-timezone-dropdown');
diff --git a/spec/frontend/pages/search/show/refresh_counts_spec.js b/spec/frontend/pages/search/show/refresh_counts_spec.js
index 81c9bf74308..6f14f0c70bd 100644
--- a/spec/frontend/pages/search/show/refresh_counts_spec.js
+++ b/spec/frontend/pages/search/show/refresh_counts_spec.js
@@ -1,4 +1,5 @@
 import MockAdapter from 'axios-mock-adapter';
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import { TEST_HOST } from 'helpers/test_constants';
 import axios from '~/lib/utils/axios_utils';
 import refreshCounts from '~/pages/search/show/refresh_counts';
@@ -18,7 +19,11 @@ describe('pages/search/show/refresh_counts', () => {
 
   beforeEach(() => {
     mock = new MockAdapter(axios);
-    setFixtures(fixture);
+    setHTMLFixture(fixture);
+  });
+
+  afterEach(() => {
+    resetHTMLFixture();
   });
 
   afterEach(() => {
diff --git a/spec/frontend/pages/sessions/new/preserve_url_fragment_spec.js b/spec/frontend/pages/sessions/new/preserve_url_fragment_spec.js
index a29db961452..4c4a0fbea11 100644
--- a/spec/frontend/pages/sessions/new/preserve_url_fragment_spec.js
+++ b/spec/frontend/pages/sessions/new/preserve_url_fragment_spec.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import preserveUrlFragment from '~/pages/sessions/new/preserve_url_fragment';
 
 describe('preserve_url_fragment', () => {
@@ -7,7 +8,11 @@ describe('preserve_url_fragment', () => {
   };
 
   beforeEach(() => {
-    loadFixtures('sessions/new.html');
+    loadHTMLFixture('sessions/new.html');
+  });
+
+  afterEach(() => {
+    resetHTMLFixture();
   });
 
   it('adds the url fragment to the login form actions', () => {
diff --git a/spec/frontend/pages/sessions/new/signin_tabs_memoizer_spec.js b/spec/frontend/pages/sessions/new/signin_tabs_memoizer_spec.js
index 601fcfedbe0..f736ce46f9b 100644
--- a/spec/frontend/pages/sessions/new/signin_tabs_memoizer_spec.js
+++ b/spec/frontend/pages/sessions/new/signin_tabs_memoizer_spec.js
@@ -1,3 +1,4 @@
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import { useLocalStorageSpy } from 'helpers/local_storage_helper';
 import AccessorUtilities from '~/lib/utils/accessor';
 import SigninTabsMemoizer from '~/pages/sessions/new/signin_tabs_memoizer';
@@ -19,11 +20,15 @@ describe('SigninTabsMemoizer', () => {
   }
 
   beforeEach(() => {
-    loadFixtures(fixtureTemplate);
+    loadHTMLFixture(fixtureTemplate);
 
     jest.spyOn(AccessorUtilities, 'canUseLocalStorage').mockReturnValue(true);
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   it('does nothing if no tab was previously selected', () => {
     createMemoizer();