Demos: Move /test/integration to /demos

.editorconfig

@@ -10,11 +10,11 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[test/cli/TapReporter.js]
+[demos/grunt-contrib-qunit.js]
 trim_trailing_whitespace = false
-[test/integration/grunt-contrib-qunit.js]
+[demos/nyc.js]
 trim_trailing_whitespace = false
-[test/integration/nyc.js]
+[test/cli/TapReporter.js]
 trim_trailing_whitespace = false
 
 [*.css]

.eslintrc.json

@@ -12,14 +12,14 @@
   "ignorePatterns": [
     "__codeorigin/**",
     "coverage/**",
+    "demos/*/qunit/**",
+    "demos/*/coverage/**",
+    "demos/*/package-lock.json",
     "docs/.jekyll-cache/**",
     "docs/_site/**",
     "lib/**",
     "qunit/**",
     "test/cli/fixtures/sourcemap/*.min.js",
-    "test/integration/*/qunit/**",
-    "test/integration/*/coverage/**",
-    "test/integration/*/package-lock.json",
     "temp/**"
   ],
   "overrides": [
@@ -190,7 +190,7 @@
       }
     },
     {
-      "files": ["test/integration/**/*.js"],
+      "files": ["demos/**/*.js"],
       "env": {
         "browser": true,
         "es2017": true,

.github/workflows/CI.yaml

@@ -28,10 +28,10 @@ jobs:
             node: 22.x
             script: npm run test
 
-          - name: "Integration"
+          - name: "Demos"
             os: ubuntu-20.04
             node: 18.x
-            script: npm run test-integration
+            script: npm run test-demos
 
           - name: "Windows: Node 18"
             os: windows-latest

.gitignore

@@ -1,13 +1,13 @@
 /.nyc_output/
 /__codeorigin/
 /coverage/
+/demos/*/package-lock.json
+/demos/*/node_modules/
 /docs/.jekyll-cache/
 /docs/_site/
 /docs/Gemfile.lock
 /test/benchmark/package-lock.json
 /test/benchmark/node_modules/
-/test/integration/*/package-lock.json
-/test/integration/*/node_modules/
 /node_modules/
 /qunit/
 /temp/

CONTRIBUTING.md

@@ -72,15 +72,13 @@ Fixes #1.
 The subject line should use the [imperative mood](https://en.wikipedia.org/wiki/Imperative_mood),
 and start with one of the following components:
 
-* `All`
 * `Assert`
 * `Build`
 * `CLI`
 * `Core`
+* `Demos`
 * `Docs`
-* `Dump`
 * `HTML Reporter`
-* `Release`
-* `Tests`
+* `Test`
 
 See also [Commit message guidelines](https://www.mediawiki.org/wiki/Gerrit/Commit_message_guidelines).

demos/grunt-contrib-qunit/qunit

@@ -0,0 +1 @@
+../../qunit

test/integration/karma-qunit/package.json → demos/karma-qunit/package.json

@@ -5,7 +5,7 @@
     "karma-chrome-launcher": "^3.2.0",
     "karma-firefox-launcher": "2.1.3",
     "karma-qunit": "^4.2.0",
-    "qunit": "file:../../.."
+    "qunit": "file:../.."
   },
   "scripts": {
     "test": "karma start --no-colors"

test/integration/nyc/package.json → demos/nyc/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "devDependencies": {
     "nyc": "15.1.0",
-    "qunit": "file:../../.."
+    "qunit": "file:../.."
   },
   "scripts": {
     "test": "nyc qunit"

demos/testem/qunit

@@ -0,0 +1 @@
+../../qunit

docs/cli.md

@@ -192,7 +192,7 @@ Generate code coverage reports with [nyc](https://istanbul.js.org/):
 }
 ```
 
-See [/test/integration/nyc/](https://github.com/qunitjs/qunit/tree/main/test/integration/nyc) in the QUnit repo for a minimal example.
+See [/demos/nyc/](https://github.com/qunitjs/qunit/tree/main/demos/nyc) in the QUnit repo for a minimal example.
 
 For a more elaborate example showcasing a unified test coverage report for tests in both Node.js and a headless browser, see [Krinkle/example-node-and-browser-qunit](https://github.com/Krinkle/example-node-and-browser-qunit-ci/).
 

package.json

@@ -91,7 +91,7 @@
     "test-cli": "node bin/qunit.js test/main/ test/cli/*.js",
     "test": "npm run lint && npm run build && npm run test-main && npm run test-cli",
     "test-nolint": "npm run build && npm run test-main && npm run test-cli",
-    "test-integration": "npm run build && node bin/qunit.js test/integration/*.js",
+    "test-demos": "npm run build && node bin/qunit.js demos/*.js",
     "browserstack": "browserstack-runner -v",
     "authors": "(echo 'Authors ordered by first contribution\n' && git log --format='%aN <%aE>' --no-merges --reverse | awk '!seen[$0]++') | tee AUTHORS.txt",
     "coverage": "npm run build-coverage && npm run coverage-cli && npm run coverage-main && nyc report",

test/cli/structure.js

@@ -83,8 +83,7 @@ QUnit.module('structure', () => {
       .map(file => file.replace(/\\/g, '/'))
       // Ignore file names containing "--", which are subresources (e.g. iframes).
       // Ignore test/benchmark, which is unrelated.
-      // Ignore test/integration/grunt-contrib-qunit, which we manage separately.
-      .filter(file => !file.includes('--') && !file.includes('benchmark') && !file.includes('integration'))
+      .filter(file => !file.includes('--') && !file.includes('benchmark'))
       .map(file => `test/${file}`);
 
     QUnit.test('files', assert => {