Merge pull request #1080 from capricorn86/task/1049-windowdispatcheve…

…ntnew-eventtest-throws-error

Task/1049 windowdispatcheventnew eventtest throws error

packages/global-registrator/package.json

@@ -71,7 +71,7 @@
 		"lint": "eslint --ignore-path .gitignore --max-warnings 0 .",
 		"lint:fix": "eslint --ignore-path .gitignore --max-warnings 0 --fix .",
 		"test": "tsc --project ./test && node ../happy-dom/bin/change-file-extension.cjs --dir=./tmp --fromExt=.js --toExt=.cjs && node ./tmp/react/React.test.cjs",
-		"test:debug": "tsc --project ./test && node --inspect-brk ./tmp/react/React.test.js"
+		"test:debug": "tsc --project ./test && node ../happy-dom/bin/change-file-extension.cjs --dir=./tmp --fromExt=.js --toExt=.cjs && node --inspect-brk ./tmp/react/React.test.cjs"
 	},
 	"dependencies": {
 		"happy-dom": "0.0.0"

packages/global-registrator/src/GlobalRegistrator.ts

@@ -1,39 +1,58 @@
 import { GlobalWindow } from 'happy-dom';
 
+const IGNORE_LIST = ['undefined', 'NaN', 'global', 'globalThis', 'window', 'globalThis'];
+const SELF_REFERRING = ['self', 'top', 'parent', 'window'];
+
 /**
  *
  */
 export default class GlobalRegistrator {
-	private static registered = [];
+	private static registered: { [key: string]: string } | null = null;
 
 	/**
 	 * Registers Happy DOM globally.
 	 */
 	public static register(): void {
-		if (this.registered.length) {
+		if (this.registered !== null) {
 			throw new Error('Failed to register. Happy DOM has already been globally registered.');
 		}
+
 		const window = new GlobalWindow();
+
+		this.registered = {};
+
 		for (const key of Object.keys(window)) {
-			if (global[key] === undefined && key !== 'undefined') {
+			if (global[key] !== window[key] && !IGNORE_LIST.includes(key)) {
+				this.registered[key] =
+					global[key] !== window[key] && global[key] !== undefined ? global[key] : null;
 				global[key] = window[key];
-				this.registered.push(key);
 			}
 		}
+
+		for (const key of SELF_REFERRING) {
+			this.registered[key] = null;
+			global[key] = global;
+		}
 	}
 
 	/**
 	 * Registers Happy DOM globally.
 	 */
 	public static unregister(): void {
-		if (!this.registered.length) {
+		if (this.registered === null) {
 			throw new Error(
 				'Failed to unregister. Happy DOM has not previously been globally registered.'
 			);
 		}
-		while (this.registered.length) {
-			const key = this.registered.pop();
-			delete global[key];
+
+		for (const key of Object.keys(this.registered)) {
+			if (this.registered[key] !== null) {
+				global[key] = this.registered[key];
+			} else {
+				delete global[key];
+			}
 		}
+
+		this.registered = null;
 	}
 }

packages/global-registrator/test/react/React.test.tsx

@@ -3,6 +3,11 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactComponent from './ReactComponent.js';
 
+const selfReferringProperties = ['self', 'top', 'parent', 'window'];
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+const originalSetTimeout = global.setTimeout;
+
 GlobalRegistrator.register();
 
 const appElement = document.createElement('app');
@@ -24,7 +29,21 @@ function unmountReactComponent(): void {
 	}
 }
 
+if (global.setTimeout === originalSetTimeout) {
+	throw Error('Happy DOM function not registered.');
+}
+
+for (const property of selfReferringProperties) {
+	if (global[property] !== global) {
+		throw Error('Self referring property property was not registered.');
+	}
+}
+
 mountReactComponent();
 unmountReactComponent();
 
 GlobalRegistrator.unregister();
+
+if (global.setTimeout !== originalSetTimeout) {
+	throw Error('Global property was not restored.');
+}