feat: [#1510] Fixes failing integration test

capricorn86 · Aug 28, 2024 · aaefaf2 · aaefaf2
1 parent 9a64097
commit aaefaf2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/packages/happy-dom/src/browser/utilities/BrowserFrameFactory.ts b/packages/happy-dom/src/browser/utilities/BrowserFrameFactory.ts
@@ -51,15 +51,17 @@ export default class BrowserFrameFactory {
 						if (exceptionObserver && frame.window) {
 							exceptionObserver.disconnect(frame.window);
 						}
+
+						(<IBrowserPage | null>frame.page) = null;
+						(<BrowserWindow | null>frame.window) = null;
+						frame[PropertySymbol.openerFrame] = null;
+						frame[PropertySymbol.openerWindow] = null;
+
 						resolve();
 					})
 					.catch((error) => reject(error));
 				if (frame.window) {
 					frame.window[PropertySymbol.destroy]();
-					(<IBrowserPage | null>frame.page) = null;
-					(<BrowserWindow | null>frame.window) = null;
-					frame[PropertySymbol.openerFrame] = null;
-					frame[PropertySymbol.openerWindow] = null;
 				}
 				return;
 			}
@@ -72,15 +74,17 @@ export default class BrowserFrameFactory {
 							if (exceptionObserver && frame.window) {
 								exceptionObserver.disconnect(frame.window);
 							}
+
+							(<IBrowserPage | null>frame.page) = null;
+							(<BrowserWindow | null>frame.window) = null;
+							frame[PropertySymbol.openerFrame] = null;
+							frame[PropertySymbol.openerWindow] = null;
+
 							resolve();
 						})
 						.catch((error) => reject(error));
 					if (frame.window) {
 						frame.window[PropertySymbol.destroy]();
-						(<IBrowserPage | null>frame.page) = null;
-						(<BrowserWindow | null>frame.window) = null;
-						frame[PropertySymbol.openerFrame] = null;
-						frame[PropertySymbol.openerWindow] = null;
 					}
 				})
 				.catch((error) => reject(error));

diff --git a/packages/integration-test/test/index.js b/packages/integration-test/test/index.js
@@ -1 +1,8 @@
-await Promise.all([import('./tests/BrowserExceptionObserver.test.js')]);
+await Promise.all([
+	import('./tests/Fetch.test.js'),
+	import('./tests/XMLHttpRequest.test.js'),
+	import('./tests/WindowGlobals.test.js'),
+	import('./tests/BrowserExceptionObserver.test.js'),
+	import('./tests/Browser.test.js'),
+	import('./tests/CommonJS.test.cjs')
+]);