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

1 files changed, 7 insertions, 2 deletions

diff --git a/spec/frontend/broadcast_notification_spec.js b/spec/frontend/broadcast_notification_spec.js
index cd947cd417a..5b9541dedfb 100644
--- a/spec/frontend/broadcast_notification_spec.js
+++ b/spec/frontend/broadcast_notification_spec.js
@@ -1,4 +1,5 @@
-import Cookies from 'js-cookie';
+import Cookies from '~/lib/utils/cookies';
+import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import initBroadcastNotifications from '~/broadcast_notification';
 
 describe('broadcast message on dismiss', () => {
@@ -9,7 +10,7 @@ describe('broadcast message on dismiss', () => {
   const endsAt = '2020-01-01T00:00:00Z';
 
   beforeEach(() => {
-    setFixtures(`
+    setHTMLFixture(`
     <div class="js-broadcast-notification-1">
       <button class="js-dismiss-current-broadcast-notification" data-id="1" data-expire-date="${endsAt}"></button>
     </div>
@@ -18,6 +19,10 @@ describe('broadcast message on dismiss', () => {
     initBroadcastNotifications();
   });
 
+  afterEach(() => {
+    resetHTMLFixture();
+  });
+
   it('removes broadcast message', () => {
     dismiss();