Assert single window from closeWindow helper

diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js
index e7f15df..6c38ba9 100644 (file)
--- a/spec/api-browser-window-spec.js
+++ b/spec/api-browser-window-spec.js
@@ -82,10 +82,7 @@ describe('browser-window module', function () {
   })
 
   afterEach(function () {
-    return closeWindow(w).then(function () {
-      w = null
-      assert.equal(BrowserWindow.getAllWindows().length, 1)
-    })
+    return closeWindow(w).then(function () { w = null })
   })
 
   describe('BrowserWindow.close()', function () {
@@ -859,7 +856,7 @@ describe('browser-window module', function () {
               assert(/Blocked a frame with origin/.test(exceptionMessage))
 
               // FIXME this popup window should be closed in sandbox.html
-              closeWindow(popupWindow).then(() => {
+              closeWindow(popupWindow, {assertSingleWindow: false}).then(() => {
                 popupWindow = null
                 done()
               })

diff --git a/spec/window-helpers.js b/spec/window-helpers.js
index 9909ec6..5a63100 100644 (file)
--- a/spec/window-helpers.js
+++ b/spec/window-helpers.js
@@ -1,9 +1,18 @@
-exports.closeWindow = (window) => {
+const assert = require('assert')
+const {BrowserWindow} = require('electron').remote
+
+exports.closeWindow = (window, {assertSingleWindow} = {assertSingleWindow: true}) => {
   if (window == null || window.isDestroyed()) {
+    if (assertSingleWindow) {
+      assert.equal(BrowserWindow.getAllWindows().length, 1)
+    }
     return Promise.resolve()
   } else {
     return new Promise((resolve, reject) => {
       window.once('closed', () => {
+        if (assertSingleWindow) {
+          assert.equal(BrowserWindow.getAllWindows().length, 1)
+        }
         resolve()
       })
       window.setClosable(true)