diff --cc spec/api-menu-spec.ts
index 5c47ee01f7,16c2e4b2df..0000000000
--- a/spec/api-menu-spec.ts
+++ b/spec/api-menu-spec.ts
@@@ -816,10 -817,7 +816,14 @@@ describe('Menu module', function () 
      it('should emit menu-will-close event', (done) => {
        menu.on('menu-will-close', () => { done(); });
        menu.popup({ window: w });
++<<<<<<< HEAD
 +      // https://github.com/electron/electron/issues/19411
 +      setTimeout(() => {
 +        menu.closePopup();
 +      });
++=======
+       menu.closePopup();
++>>>>>>> test: remove workaround for fixed Menu.closePopup issue
      });
  
      it('returns immediately', () => {
@@@ -848,18 -846,12 +852,26 @@@
  
        expect(x).to.equal(100);
        expect(y).to.equal(101);
++<<<<<<< HEAD
 +      // https://github.com/electron/electron/issues/19411
 +      setTimeout(() => {
 +        menu.closePopup();
 +      });
++=======
+       menu.closePopup();
++>>>>>>> test: remove workaround for fixed Menu.closePopup issue
      });
  
      it('works with a given BrowserWindow, no options, and a callback', (done) => {
        menu.popup({ window: w, callback: () => done() });
++<<<<<<< HEAD
 +      // https://github.com/electron/electron/issues/19411
 +      setTimeout(() => {
 +        menu.closePopup();
 +      });
++=======
+       menu.closePopup();
++>>>>>>> test: remove workaround for fixed Menu.closePopup issue
      });
  
      it('prevents menu from getting garbage-collected when popuping', async () => {