cure53 · luxaritas · Nov 16, 2023 · Nov 16, 2023 · Nov 16, 2023 · Nov 17, 2023
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,9 +17,10 @@
     "build:cjs": "rollup -c -f cjs -o dist/purify.cjs.js",
     "build:cleanup": "rimraf dist/types",
     "test:jsdom": "cross-env NODE_ENV=test BABEL_ENV=rollup node test/jsdom-node-runner --dot",
+    "test:happy-dom": "cross-env NODE_ENV=test BABEL_ENV=rollup node test/happy-dom-node-runner --dot",
     "test:karma": "cross-env NODE_ENV=test BABEL_ENV=rollup karma start test/karma.conf.js --log-level warn ",
-    "test:ci": "cross-env NODE_ENV=test BABEL_ENV=rollup npm run test:jsdom && npm run test:karma -- --log-level error --reporters dots --single-run --shouldTestOnBrowserStack=\"${TEST_BROWSERSTACK}\" --shouldProbeOnly=\"${TEST_PROBE_ONLY}\"",
-    "test": "cross-env NODE_ENV=test BABEL_ENV=rollup npm run lint &&  npm run test:jsdom && npm run test:karma -- --browsers Chrome"
+    "test:ci": "cross-env NODE_ENV=test BABEL_ENV=rollup npm run test:jsdom && npm run test:happy-dom && npm run test:karma -- --log-level error --reporters dots --single-run --shouldTestOnBrowserStack=\"${TEST_BROWSERSTACK}\" --shouldProbeOnly=\"${TEST_PROBE_ONLY}\"",
+    "test": "cross-env NODE_ENV=test BABEL_ENV=rollup npm run lint &&  npm run test:jsdom && npm run test:happy-dom && npm run test:karma -- --browsers Chrome"
   },
   "main": "./dist/purify.cjs.js",
   "module": "./dist/purify.es.mjs",
@@ -106,6 +107,7 @@
     "cross-env": "^7.0.3",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
+    "happy-dom": "^15.11.6",
     "jquery": "^3.6.0",
     "jsdom": "^20.0.0",
     "karma": "^6.3.17",

diff --git a/test/jsdom-node.js → test/base-node-runner.js b/test/jsdom-node.js → test/base-node-runner.js
@@ -2,21 +2,30 @@
 /* global QUnit */
 'use strict';
 
-// Test DOMPurify + jsdom using Node.js (version 8 and up)
+global.QUnit = require('qunit');
+
+const qunitTap = require('qunit-tap');
+const argument = process.argv[2];
+
 const createDOMPurify = require('../dist/purify.cjs');
-const jsdom = require('jsdom');
-const { JSDOM, VirtualConsole } = jsdom;
-const virtualConsole = new VirtualConsole();
-const { window } = new JSDOM(
-  `<html><head></head><body><div id="qunit-fixture"></div></body></html>`,
-  { runScripts: 'dangerously', virtualConsole }
-);
-require('jquery')(window);
 
 const sanitizeTestSuite = require('./test-suite');
 const bootstrapTestSuite = require('./bootstrap-test-suite');
 
-async function startQUnit() {
+async function run(createWindow, runtimeName) {
+  qunitTap(QUnit, (line) => {
+    if (/^not ok/.test(line)) {
+      process.exitCode = 1;
+      return console.log('\n', line);
+    }
+
+    if (argument === '--dot') {
+      return process.stdout.write('.');
+    }
+
+    console.log(line);
+  });
+
   const { default: tests } = await import('./fixtures/expect.mjs');
   const xssTests = tests.filter((element) => /alert/.test(element.payload));
 
@@ -33,26 +42,31 @@ async function startQUnit() {
 
   QUnit.config.autostart = false;
 
-  QUnit.module('DOMPurify - bootstrap', bootstrapTestSuite(JSDOM));
-
-  QUnit.module('DOMPurify in jsdom');
+  QUnit.module('DOMPurify - bootstrap', bootstrapTestSuite(createWindow));
 
-  if (!window.jQuery) {
-    console.warn('Unable to load jQuery');
-  }
+  QUnit.module(`DOMPurify in ${runtimeName}`);
 
+  const window = createWindow();
   const DOMPurify = createDOMPurify(window);
   if (!DOMPurify.isSupported) {
-    console.error('Unexpected error returned by jsdom.env():', err, err.stack);
+    console.error('DOMPurify reports as not supported');
     process.exit(1);
   }
 
-  window.alert = () => {
+  window.__proto__.alert = () => {
     window.xssed = true;
   };
 
   sanitizeTestSuite(DOMPurify, window, tests, xssTests);
   QUnit.start();
+
+  QUnit.load()
 }
 
-module.exports = startQUnit;
+module.exports = {
+  run,
+  documentHtml: `<html>
+    <head><</head>
+    <body><div id="qunit-fixture"></div></body>
+  </html>`
+};
diff --git a/test/bootstrap-test-suite.js b/test/bootstrap-test-suite.js
@@ -1,6 +1,6 @@
 const fs = require('fs');
 
-module.exports = function (JSDOM) {
+module.exports = function (createWindow) {
   class StringWrapper {
     constructor(s) {
       this.s = s;
@@ -19,10 +19,8 @@ module.exports = function (JSDOM) {
     onload
   ) {
     const testDone = assert.async();
-    const { window } = new JSDOM('<head></head>', {
-      runScripts: 'dangerously',
-    });
-    require('jquery')(window);
+    const window = createWindow();
+
     if (setup) {
       setup(window);
     }
@@ -272,4 +270,4 @@ module.exports = function (JSDOM) {
       );
     }
   );
-};
+}
diff --git a/test/happy-dom-node-runner.js b/test/happy-dom-node-runner.js
@@ -0,0 +1,16 @@
+/* jshint node: true, esnext: true */
+'use strict';
+
+const happyDom = require('happy-dom');
+const { Window } = happyDom;
+
+const {run, documentHtml} = require('./base-node-runner');
+
+function createWindow() {
+  const window = new Window();
+  window.document.documentElement.innerHTML = documentHtml;
+  require('jquery')(window);
+  return window;
+}
+
+run(createWindow, 'happy-dom');
diff --git a/test/jsdom-node-runner.js b/test/jsdom-node-runner.js
@@ -1,24 +1,19 @@
 /* jshint node: true, esnext: true */
-/* global QUnit */
 'use strict';
 
-global.QUnit = require('qunit');
+const jsdom = require('jsdom');
+const { JSDOM, VirtualConsole } = jsdom;
 
-const qunitTap = require('qunit-tap');
-const argument = process.argv[2];
+const {run, documentHtml} = require('./base-node-runner');
 
-qunitTap(QUnit, (line) => {
-  if (/^not ok/.test(line)) {
-    process.exitCode = 1;
-    return console.log('\n', line);
-  }
+function createWindow() {
+  const virtualConsole = new VirtualConsole();
+  const { window } = new JSDOM(
+    documentHtml,
+    { runScripts: 'dangerously', virtualConsole }
+  );
+  require('jquery')(window);
+  return window;
+}
 
-  if (argument === '--dot') {
-    return process.stdout.write('.');
-  }
-
-  console.log(line);
-});
-
-const startQUnit = require('./jsdom-node');
-startQUnit().then(() => QUnit.load());
+run(createWindow, 'jsdom');