Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/frontend/confirm_modal_spec.js b/spec/frontend/confirm_modal_spec.js
index 89cfc3ef3a3..b14d1c3e01d 100644
--- a/spec/frontend/confirm_modal_spec.js
+++ b/spec/frontend/confirm_modal_spec.js
@@ -51,7 +51,7 @@ describe('ConfirmModal', () => {
   const findModalOkButton = (modal, variant) =>
     modal.querySelector(`.modal-footer .btn-${variant}`);
   const findModalCancelButton = modal => modal.querySelector('.modal-footer .btn-secondary');
-  const modalIsHidden = () => findModal().getAttribute('aria-hidden') === 'true';
+  const modalIsHidden = () => findModal() === null;
 
   const serializeModal = (modal, buttonIndex) => {
     const { modalAttributes } = buttons[buttonIndex];
@@ -101,7 +101,9 @@ describe('ConfirmModal', () => {
         });
 
         it('closes the modal', () => {
-          expect(modalIsHidden()).toBe(true);
+          setImmediate(() => {
+            expect(modalIsHidden()).toBe(true);
+          });
         });
       });
     });