Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 34 insertions, 15 deletions

diff --git a/spec/frontend/flash_spec.js b/spec/frontend/flash_spec.js
index 6a5ac76a4d0..28e8522cc12 100644
--- a/spec/frontend/flash_spec.js
+++ b/spec/frontend/flash_spec.js
@@ -357,27 +357,46 @@ describe('Flash', () => {
   });
 
   describe('removeFlashClickListener', () => {
-    beforeEach(() => {
-      document.body.innerHTML += `
-        <div class="flash-container">
-          <div class="flash">
-            <div class="close-icon js-close-icon"></div>
+    let el;
+
+    describe('with close icon', () => {
+      beforeEach(() => {
+        el = document.createElement('div');
+        el.innerHTML = `
+          <div class="flash-container">
+            <div class="flash">
+              <div class="close-icon js-close-icon"></div>
+            </div>
           </div>
-        </div>
-      `;
-    });
+        `;
+      });
 
-    it('removes global flash on click', (done) => {
-      const flashEl = document.querySelector('.flash');
+      it('removes global flash on click', (done) => {
+        removeFlashClickListener(el, false);
 
-      removeFlashClickListener(flashEl, false);
+        el.querySelector('.js-close-icon').click();
 
-      flashEl.querySelector('.js-close-icon').click();
+        setImmediate(() => {
+          expect(document.querySelector('.flash')).toBeNull();
 
-      setImmediate(() => {
-        expect(document.querySelector('.flash')).toBeNull();
+          done();
+        });
+      });
+    });
+
+    describe('without close icon', () => {
+      beforeEach(() => {
+        el = document.createElement('div');
+        el.innerHTML = `
+          <div class="flash-container">
+            <div class="flash">
+            </div>
+          </div>
+        `;
+      });
 
-        done();
+      it('does not throw', () => {
+        expect(() => removeFlashClickListener(el, false)).not.toThrow();
       });
     });
   });