Add latest changes from gitlab-org/gitlab@master

3 files changed, 18 insertions, 4 deletions

diff --git a/spec/frontend/code_navigation/components/app_spec.js b/spec/frontend/code_navigation/components/app_spec.js
index f2f97092c5a..b85047dc816 100644
--- a/spec/frontend/code_navigation/components/app_spec.js
+++ b/spec/frontend/code_navigation/components/app_spec.js
@@ -1,6 +1,8 @@
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
+
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import App from '~/code_navigation/components/app.vue';
 import Popover from '~/code_navigation/components/popover.vue';
 import createState from '~/code_navigation/store/state';
@@ -75,12 +77,14 @@ describe('Code navigation app component', () => {
   });
 
   it('calls showDefinition when clicking blob viewer', () => {
-    setFixtures('<div class="blob-viewer"></div>');
+    setHTMLFixture('<div class="blob-viewer"></div>');
 
     factory();
 
     document.querySelector('.blob-viewer').click();
 
     expect(showDefinition).toHaveBeenCalled();
+
+    resetHTMLFixture();
   });
 });
diff --git a/spec/frontend/code_navigation/store/actions_spec.js b/spec/frontend/code_navigation/store/actions_spec.js
index c26416aca94..c47a9e697b6 100644
--- a/spec/frontend/code_navigation/store/actions_spec.js
+++ b/spec/frontend/code_navigation/store/actions_spec.js
@@ -1,4 +1,5 @@
 import MockAdapter from 'axios-mock-adapter';
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import testAction from 'helpers/vuex_action_helper';
 import actions from '~/code_navigation/store/actions';
 import { setCurrentHoverElement, addInteractionClass } from '~/code_navigation/utils';
@@ -174,12 +175,16 @@ describe('Code navigation actions', () => {
     let target;
 
     beforeEach(() => {
-      setFixtures(
+      setHTMLFixture(
         '<div data-path="index.js"><div class="line"><div class="js-test"></div></div></div>',
       );
       target = document.querySelector('.js-test');
     });
 
+    afterEach(() => {
+      resetHTMLFixture();
+    });
+
     it('returns early when no data exists', () => {
       return testAction(actions.showDefinition, { target }, {}, [], []);
     });
diff --git a/spec/frontend/code_navigation/utils/index_spec.js b/spec/frontend/code_navigation/utils/index_spec.js
index 682c8bce8c5..b8448709f0b 100644
--- a/spec/frontend/code_navigation/utils/index_spec.js
+++ b/spec/frontend/code_navigation/utils/index_spec.js
@@ -1,3 +1,4 @@
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import {
   cachedData,
   getCurrentHoverElement,
@@ -35,11 +36,15 @@ describe('setCurrentHoverElement', () => {
 
 describe('addInteractionClass', () => {
   beforeEach(() => {
-    setFixtures(
+    setHTMLFixture(
       '<div data-path="index.js"><div class="blob-content"><div id="LC1" class="line"><span>console</span><span>.</span><span>log</span></div><div id="LC2" class="line"><span>function</span></div></div></div>',
     );
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   it.each`
     line | char | index
     ${0} | ${0} | ${0}
@@ -59,7 +64,7 @@ describe('addInteractionClass', () => {
 
   describe('wrapTextNodes', () => {
     beforeEach(() => {
-      setFixtures(
+      setHTMLFixture(
         '<div data-path="index.js"><div class="blob-content"><div id="LC1" class="line"> Text </div></div></div>',
       );
     });