Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/frontend/user_popovers_spec.js b/spec/frontend/user_popovers_spec.js
index 4edd526100a..fa598716645 100644
--- a/spec/frontend/user_popovers_spec.js
+++ b/spec/frontend/user_popovers_spec.js
@@ -1,5 +1,5 @@
 import { within } from '@testing-library/dom';
-
+import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import UsersCache from '~/lib/utils/users_cache';
 import initUserPopovers from '~/user_popovers';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -43,7 +43,7 @@ describe('User Popovers', () => {
   };
 
   beforeEach(() => {
-    loadFixtures(fixtureTemplate);
+    loadHTMLFixture(fixtureTemplate);
 
     const usersCacheSpy = () => Promise.resolve(dummyUser);
     jest.spyOn(UsersCache, 'retrieveById').mockImplementation((userId) => usersCacheSpy(userId));
@@ -57,6 +57,10 @@ describe('User Popovers', () => {
     popovers = initUserPopovers(document.querySelectorAll(selector));
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   it('initializes a popover for each user link with a user id', () => {
     const linksWithUsers = findFixtureLinks();