Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 2 deletions

diff --git a/spec/frontend/lib/utils/dom_utils_spec.js b/spec/frontend/lib/utils/dom_utils_spec.js
index 766772cb521..88dac449527 100644
--- a/spec/frontend/lib/utils/dom_utils_spec.js
+++ b/spec/frontend/lib/utils/dom_utils_spec.js
@@ -1,3 +1,4 @@
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import {
   addClassIfElementExists,
   canScrollUp,
@@ -24,10 +25,14 @@ describe('DOM Utils', () => {
     let parentElement;
 
     beforeEach(() => {
-      setFixtures(fixture);
+      setHTMLFixture(fixture);
       parentElement = document.querySelector('.parent');
     });
 
+    afterEach(() => {
+      resetHTMLFixture();
+    });
+
     it('adds class if element exists', () => {
       const childElement = parentElement.querySelector('.child');
 
@@ -127,10 +132,14 @@ describe('DOM Utils', () => {
     let element;
 
     beforeEach(() => {
-      setFixtures('<div data-foo-bar data-baz data-qux="">');
+      setHTMLFixture('<div data-foo-bar data-baz data-qux="">');
       element = document.querySelector('[data-foo-bar]');
     });
 
+    afterEach(() => {
+      resetHTMLFixture();
+    });
+
     it('throws if not given an element', () => {
       expect(() => parseBooleanDataAttributes(null, ['baz'])).toThrow();
     });