Test: Move various files to a new "browser-runner" subdir

We've moved most files in this directory out already. The two remaining files relate to the now-decoupled browser runner, not the HTML Reporter. Move several other clearly browser-specific test files there as well.
qunitjs · Jul 15, 2024 · 3757f2b · 3757f2b
1 parent f1b373d
commit 3757f2b
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 27 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -73,14 +73,9 @@ module.exports = function (grunt) {
           urls: [
             'test/index.html',
 
-            'test/amd.html',
-            'test/autostart.html',
-            'test/config-fixture-null.html',
-            'test/config-fixture-string.html',
             'test/dynamic-import.html',
             'test/events-filters.html',
             'test/events-in-test.html',
-            'test/headless.html',
             'test/index-es5.html',
             'test/index-xhtml.xhtml',
             'test/logs.html',
@@ -106,8 +101,14 @@ module.exports = function (grunt) {
             'test/webWorker.html',
 
             'demos/q4000-qunit.html',
-            'test/reporter-html/window-onerror-preexisting-handler.html',
-            'test/reporter-html/window-onerror.html'
+
+            'test/browser-runner/amd.html',
+            'test/browser-runner/autostart.html',
+            'test/browser-runner/config-fixture-null.html',
+            'test/browser-runner/config-fixture-string.html',
+            'test/browser-runner/headless.html',
+            'test/browser-runner/window-onerror-preexisting-handler.html',
+            'test/browser-runner/window-onerror.html'
 
           ].map(file => `http://localhost:${connectPort}/${file}`)
         }

diff --git a/test/amd.html → test/browser-runner/amd.html b/test/amd.html → test/browser-runner/amd.html
@@ -3,9 +3,9 @@
 <head>
   <meta charset="UTF-8">
   <title>amd</title>
-  <link rel="stylesheet" href="../src/qunit.css">
-  <script src="../qunit/qunit.js"></script>
-  <script src="../node_modules/requirejs/require.js"></script>
+  <link rel="stylesheet" href="../../src/qunit.css">
+  <script src="../../qunit/qunit.js"></script>
+  <script src="../../node_modules/requirejs/require.js"></script>
 </head>
 <body>
   <div id="qunit"></div>

diff --git a/test/amd.js → test/browser-runner/amd.js b/test/amd.js → test/browser-runner/amd.js
diff --git a/test/autostart.html → test/browser-runner/autostart.html b/test/autostart.html → test/browser-runner/autostart.html
@@ -3,11 +3,11 @@
 <head>
   <meta charset="UTF-8">
   <title>autostart</title>
-  <link rel="stylesheet" href="../src/qunit.css">
+  <link rel="stylesheet" href="../../src/qunit.css">
 </head>
 <body>
   <div id="qunit"></div>
-  <script src="../qunit/qunit.js"></script>
+  <script src="../../qunit/qunit.js"></script>
   <script>
   window.times = {};
 

diff --git a/test/autostart.js → test/browser-runner/autostart.js b/test/autostart.js → test/browser-runner/autostart.js
diff --git a/test/config-fixture-null.html → test/browser-runner/config-fixture-null.html b/test/config-fixture-null.html → test/browser-runner/config-fixture-null.html
@@ -3,8 +3,8 @@
 <head>
   <meta charset="UTF-8">
   <title>config-fixture-null</title>
-  <link rel="stylesheet" href="../src/qunit.css">
-  <script src="../qunit/qunit.js"></script>
+  <link rel="stylesheet" href="../../src/qunit.css">
+  <script src="../../qunit/qunit.js"></script>
   <script src="config-fixture-null.js"></script>
 </head>
 <body>

diff --git a/test/config-fixture-null.js → test/browser-runner/config-fixture-null.js b/test/config-fixture-null.js → test/browser-runner/config-fixture-null.js
diff --git a/test/config-fixture-string.html → ...browser-runner/config-fixture-string.html b/test/config-fixture-string.html → ...browser-runner/config-fixture-string.html
@@ -3,8 +3,8 @@
 <head>
   <meta charset="UTF-8">
   <title>config-fixture-string</title>
-  <link rel="stylesheet" href="../src/qunit.css">
-  <script src="../qunit/qunit.js"></script>
+  <link rel="stylesheet" href="../../src/qunit.css">
+  <script src="../../qunit/qunit.js"></script>
   <script src="config-fixture-string.js"></script>
 </head>
 <body>

diff --git a/test/config-fixture-string.js → test/browser-runner/config-fixture-string.js b/test/config-fixture-string.js → test/browser-runner/config-fixture-string.js
diff --git a/test/headless.html → test/browser-runner/headless.html b/test/headless.html → test/browser-runner/headless.html
@@ -3,10 +3,12 @@
 <head>
   <meta charset="UTF-8">
   <title>headless</title>
-  <link rel="stylesheet" href="../src/qunit.css">
-  <script src="../qunit/qunit.js"></script>
-  <script src="main/test.js"></script>
-  <script src="main/deepEqual.js"></script>
+  <link rel="stylesheet" href="../../src/qunit.css">
+  <script src="../../qunit/qunit.js"></script>
+  <script src="../main/assert.js"></script>
+  <script src="../main/deepEqual.js"></script>
+  <script src="../main/TapReporter.js"></script>
+  <script src="../main/test.js"></script>
   <script>
   (function () {
     function createCallback (eventName) {

diff --git a/...l/window-onerror-preexisting-handler.html → ...r/window-onerror-preexisting-handler.html b/...l/window-onerror-preexisting-handler.html → ...r/window-onerror-preexisting-handler.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<meta charset="UTF-8">
-	<title>QUnit HTML Reporter - window.onerror tests with preexisting handler</title>
+	<title>window.onerror with pre-existing handler</title>
 	<link rel="stylesheet" href="../../src/qunit.css">
 	<script>
 		/* exported onerrorCallingContext */

diff --git a/...tml/window-onerror-preexisting-handler.js → ...ner/window-onerror-preexisting-handler.js b/...tml/window-onerror-preexisting-handler.js → ...ner/window-onerror-preexisting-handler.js
@@ -1,7 +1,7 @@
 /* eslint-env browser */
 /* global onerrorReturnValue: true, onerrorCallingContext: true */
 
-QUnit.module('window.onerror (with preexisting handler)', function (hooks) {
+QUnit.module('window.onerror [with preexisting handler]', function (hooks) {
   var originalOnUncaught;
 
   hooks.beforeEach(function () {

diff --git a/test/reporter-html/window-onerror.html → test/browser-runner/window-onerror.html b/test/reporter-html/window-onerror.html → test/browser-runner/window-onerror.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<meta charset="UTF-8">
-	<title>QUnit HTML Reporter - window.onerror tests with no existing handler</title>
+	<title>window-onerror (no pre-existing handler)</title>
 	<link rel="stylesheet" href="../../src/qunit.css">
 	<script src="../../qunit/qunit.js"></script>
 	<script src="./window-onerror.js"></script>

diff --git a/test/reporter-html/window-onerror.js → test/browser-runner/window-onerror.js b/test/reporter-html/window-onerror.js → test/browser-runner/window-onerror.js
@@ -1,5 +1,5 @@
 /* eslint-env browser */
-QUnit.module('window.onerror (no preexisting handler)', function (hooks) {
+QUnit.module('window.onerror [no preexisting handler]', function (hooks) {
   var originalOnUncaught;
 
   hooks.beforeEach(function () {

diff --git a/test/cli/structure.js b/test/cli/structure.js
@@ -73,7 +73,7 @@ QUnit.module('structure', () => {
   });
 
   QUnit.module('test/**.html', () => {
-    // Get a list of the HTML files, including in subdirectories (e.g. "test/reporter-html/").
+    // Get a list of the HTML files, including in subdirectories (e.g. "test/browser-runner/").
     const files = glob('**/*.html', {
       cwd: path.join(__dirname, '..'),
       filesOnly: true

diff --git a/test/main/browser-runner.js b/test/main/browser-runner.js
@@ -25,13 +25,13 @@ QUnit.module('browser-runner', function () {
     QUnit.test('example', function (assert) {
       var done = assert.async();
 
-      this.expectedFailure = 'global failure: Error: Error thrown in non-returned promise!';
+      this.expectedFailure = 'global failure: Error: Example from non-returned promise!';
 
       // eslint-disable-next-line compat/compat -- Checked
       Promise.resolve().then(function () {
         // prevent test from exiting before unhandled rejection fires
         setTimeout(done, 20);
-        throw new Error('Error thrown in non-returned promise!');
+        throw new Error('Example from non-returned promise!');
       });
     });
   });