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

1 files changed, 6 insertions, 1 deletions

diff --git a/spec/frontend/activities_spec.js b/spec/frontend/activities_spec.js
index 00519148b30..ebace21217a 100644
--- a/spec/frontend/activities_spec.js
+++ b/spec/frontend/activities_spec.js
@@ -1,6 +1,7 @@
 /* eslint-disable no-unused-expressions, no-prototype-builtins, no-new, no-shadow */
 
 import $ from 'jquery';
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import Activities from '~/activities';
 import Pager from '~/pager';
 
@@ -38,11 +39,15 @@ describe('Activities', () => {
   }
 
   beforeEach(() => {
-    loadFixtures(fixtureTemplate);
+    loadHTMLFixture(fixtureTemplate);
     jest.spyOn(Pager, 'init').mockImplementation(() => {});
     new Activities();
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   for (let i = 0; i < filters.length; i += 1) {
     ((i) => {
       describe(`when selecting ${getEventName(i)}`, () => {