Test: Rewrite reporter-html/urlparams-filter.html to test/main/HtmlRe…

…porter.js The part that was testing actual filtering logic in the core runner, is left behind and moved to the top-level test directory. This is now a sibling to half a dozen other `urlparams-*.html` suites that we have already.
qunitjs · Jul 3, 2024 · 63707ae · 63707ae
1 parent 2d0d2ca
commit 63707ae
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -95,13 +95,13 @@ module.exports = function (grunt) {
             'test/sandboxed-iframe.html',
             'test/seed.html',
             'test/startError.html',
+            'test/urlparams-filter.html',
             'test/urlparams-module.html',
             'test/urlparams-moduleId.html',
             'test/urlparams-testId.html',
             'test/webWorker.html',
 
             'test/reporter-html/dropdown-many.html',
-            'test/reporter-html/urlparams-filter.html',
             'test/reporter-html/window-onerror-preexisting-handler.html',
             'test/reporter-html/window-onerror.html',
             'test/reporter-html/xhtml-escape-details-source.xhtml'

diff --git a/test/main/HtmlReporter.js b/test/main/HtmlReporter.js
@@ -118,3 +118,20 @@ QUnit.test('hidepassed', function (assert) {
   assert.strictEqual(node.nodeName, 'INPUT');
   assert.strictEqual(node.checked, true);
 });
+
+QUnit.test('filter', function (assert) {
+  var element = document.createElement('div');
+  new QUnit.reporters.html(this.MockQUnit, {
+    element: element,
+    config: {
+      urlConfig: [],
+      filter: '!/Foo|bar/'
+    }
+  });
+  this.MockQUnit._do_start_empty();
+
+  // Toolbar
+  var node = element.querySelector('#qunit-filter-input');
+  assert.strictEqual(node.nodeName, 'INPUT');
+  assert.strictEqual(node.value, '!/Foo|bar/');
+});
diff --git a/test/reporter-html/urlparams-filter.html → test/urlparams-filter.html b/test/reporter-html/urlparams-filter.html → test/urlparams-filter.html
@@ -3,11 +3,11 @@
 <head>
 	<meta charset="UTF-8">
 	<title>QUnit</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 src="urlparams-filter.js"></script>
 </body>
 </html>
diff --git a/test/reporter-html/urlparams-filter.js → test/urlparams-filter.js b/test/reporter-html/urlparams-filter.js → test/urlparams-filter.js
@@ -1,7 +1,6 @@
 /* eslint-env browser */
-
-// regular expression (case-sensitive), inverted
 if (!location.search) {
+  // regular expression (case-sensitive), inverted
   location.replace('?filter=!/Foo|bar/');
 }
 
@@ -10,11 +9,6 @@ QUnit.module('filter');
 QUnit.test('config parsed', function (assert) {
   assert.strictEqual(QUnit.config.filter, '!/Foo|bar/');
 });
-QUnit.test('interface', function (assert) {
-  var node = document.getElementById('qunit-filter-input');
-  assert.strictEqual(node.nodeName, 'INPUT');
-  assert.strictEqual(node.value, '!/Foo|bar/');
-});
 
 QUnit.test('foo test', function (assert) {
   assert.true(true);

diff --git a/test/urlparams-module.js b/test/urlparams-module.js
@@ -5,8 +5,7 @@ if (!location.search) {
 
 QUnit.module('Foo');
 
-QUnit.test('Foo test', function (assert) {
-  assert.true(true, 'run module Foo');
+QUnit.test('config parsed', function (assert) {
   assert.strictEqual(QUnit.config.module, 'Foo', 'parsed config');
 });