Merge branch 'jquery:main' into 1996-support-function-type-in-cancel-option

Author: kghandi

.github/workflows/codeql-analysis.yml

@@ -33,15 +33,15 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
         # Override language selection by uncommenting this and choosing your languages
         # with:
         #   languages: go, javascript, csharp, python, cpp, java
 
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -55,4 +55,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0

.github/workflows/filestash.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: filestash
     env:
-      NODE_VERSION: 20.x
+      NODE_VERSION: 22.x
     name: Update Filestash
     steps:
       - name: Checkout
@@ -25,7 +25,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}

.github/workflows/node.js.yml

@@ -12,21 +12,21 @@ permissions:
   contents: read
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
 
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
     name: |
-      ${{ matrix.BROWSER }} | ${{ matrix.JQUERYS.name }}
+      ${{ matrix.BROWSER }} | ${{ matrix.CONFIGS.name }}
     strategy:
       fail-fast: false
       matrix:
         BROWSER: [chrome, firefox]
-        JQUERYS:
-          - versions: --jquery git --jquery 3.x-git
+        CONFIGS:
+          - config: jtr-git.yml
             name: jQuery git
-          - versions: --jquery 3.7.1 --jquery 3.6.4 --jquery 2.2.4 --jquery 1.12.4
+          - config: jtr-stable.yml
             name: jQuery stable
 
     steps:
@@ -39,7 +39,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
@@ -57,21 +57,21 @@ jobs:
 
       - name: Test
         run: |
-          npm run test:unit -- -h -b ${{ matrix.BROWSER }} \
-            ${{ matrix.JQUERYS.versions }} \
-            --retries 3 --hard-retries 1
+          npm run test:unit -- \
+            --headless -b ${{ matrix.BROWSER }} \
+            -c ${{ matrix.CONFIGS.config }}
 
   edge:
     runs-on: windows-latest
     name: |
-      edge | ${{ matrix.JQUERYS.name }}
+      edge | ${{ matrix.CONFIGS.name }}
     strategy:
       fail-fast: false
       matrix:
-        JQUERYS:
-          - versions: --jquery git --jquery 3.x-git
+        CONFIGS:
+          - config: jtr-git.yml
             name: jQuery git
-          - versions: --jquery 3.7.1 --jquery 3.6.4 --jquery 2.2.4 --jquery 1.12.4
+          - config: jtr-stable.yml
             name: jQuery stable
     steps:
       - name: Checkout
@@ -83,7 +83,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
@@ -97,22 +97,19 @@ jobs:
         run: npm run build
 
       - name: Test
-        run: |
-          npm run test:unit -- -h -b edge `
-            ${{ matrix.JQUERYS.versions }} `
-            --retries 3 --hard-retries 1
+        run: npm run test:unit -- -- --headless -b edge -c ${{ matrix.CONFIGS.config }}
 
   safari:
     runs-on: macos-latest
     name: |
-      safari | ${{ matrix.JQUERYS.name }}
+      safari | ${{ matrix.CONFIGS.name }}
     strategy:
       fail-fast: false
       matrix:
-        JQUERYS:
-          - versions: --jquery git --jquery 3.x-git
+        CONFIGS:
+          - config: jtr-git.yml
             name: jQuery git
-          - versions: --jquery 3.7.1 --jquery 3.6.4 --jquery 2.2.4 --jquery 1.12.4
+          - config: jtr-stable.yml
             name: jQuery stable
     steps:
       - name: Checkout
@@ -124,7 +121,7 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Cache
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ env.NODE_VERSION }}-npm-lock-${{ hashFiles('**/package-lock.json') }}
@@ -138,7 +135,4 @@ jobs:
         run: npm run build
 
       - name: Test
-        run: |
-          npm run test:unit -- -b safari \
-            ${{ matrix.JQUERYS.versions }} \
-            --retries 3 --hard-retries 1
+        run: npm run test:unit -- -b safari -c ${{ matrix.CONFIGS.config }}

jtr-git.yml

@@ -0,0 +1,38 @@
+version: 1
+
+base-url: /tests/unit/
+
+test-urls:
+  - accordion/accordion.html
+  - autocomplete/autocomplete.html
+  - button/button.html
+  - checkboxradio/checkboxradio.html
+  - controlgroup/controlgroup.html
+  - core/core.html
+  - datepicker/datepicker.html
+  - dialog/dialog.html
+  - draggable/draggable.html
+  - droppable/droppable.html
+  - effects/effects.html
+  - form-reset-mixin/form-reset-mixin.html
+  - jquery-patch/jquery-patch.html
+  - menu/menu.html
+  - position/position.html
+  - progressbar/progressbar.html
+  - resizable/resizable.html
+  - selectable/selectable.html
+  - selectmenu/selectmenu.html
+  - slider/slider.html
+  - sortable/sortable.html
+  - spinner/spinner.html
+  - tabs/tabs.html
+  - tooltip/tooltip.html
+  - widget/widget.html
+
+runs:
+  jquery:
+    - git
+    - 3.x-git
+
+retries: 2
+hard-retries: 1

jtr-stable.yml

@@ -0,0 +1,40 @@
+version: 1
+
+base-url: /tests/unit/
+
+test-urls:
+  - accordion/accordion.html
+  - autocomplete/autocomplete.html
+  - button/button.html
+  - checkboxradio/checkboxradio.html
+  - controlgroup/controlgroup.html
+  - core/core.html
+  - datepicker/datepicker.html
+  - dialog/dialog.html
+  - draggable/draggable.html
+  - droppable/droppable.html
+  - effects/effects.html
+  - form-reset-mixin/form-reset-mixin.html
+  - jquery-patch/jquery-patch.html
+  - menu/menu.html
+  - position/position.html
+  - progressbar/progressbar.html
+  - resizable/resizable.html
+  - selectable/selectable.html
+  - selectmenu/selectmenu.html
+  - slider/slider.html
+  - sortable/sortable.html
+  - spinner/spinner.html
+  - tabs/tabs.html
+  - tooltip/tooltip.html
+  - widget/widget.html
+
+runs:
+  jquery:
+    - 3.7.1
+    - 3.6.4
+    - 2.2.4
+    - 1.12.4
+
+retries: 2
+hard-retries: 1

jtr.yml

@@ -0,0 +1,30 @@
+version: 1
+
+base-url: /tests/unit/
+
+test-urls:
+  - accordion/accordion.html
+  - autocomplete/autocomplete.html
+  - button/button.html
+  - checkboxradio/checkboxradio.html
+  - controlgroup/controlgroup.html
+  - core/core.html
+  - datepicker/datepicker.html
+  - dialog/dialog.html
+  - draggable/draggable.html
+  - droppable/droppable.html
+  - effects/effects.html
+  - form-reset-mixin/form-reset-mixin.html
+  - jquery-patch/jquery-patch.html
+  - menu/menu.html
+  - position/position.html
+  - progressbar/progressbar.html
+  - resizable/resizable.html
+  - selectable/selectable.html
+  - selectmenu/selectmenu.html
+  - slider/slider.html
+  - sortable/sortable.html
+  - spinner/spinner.html
+  - tabs/tabs.html
+  - tooltip/tooltip.html
+  - widget/widget.html

package.json

@@ -47,22 +47,16 @@
 	"scripts": {
 		"build": "grunt build",
 		"lint": "grunt lint",
-		"test:server": "node tests/runner/server.js",
-		"test:unit": "node tests/runner/command.js",
-		"test": "grunt && npm run test:unit -- -h"
+		"test:server": "jtr serve",
+		"test:unit": "jtr",
+		"test": "grunt && npm run test:unit -- --headless"
 	},
 	"dependencies": {
 		"jquery": ">=1.12.0 <5.0.0"
 	},
 	"devDependencies": {
-		"body-parser": "1.20.3",
-		"browserstack-local": "1.5.5",
 		"commitplease": "3.2.0",
-		"diff": "5.2.0",
 		"eslint-config-jquery": "3.0.2",
-		"exit-hook": "4.0.0",
-		"express": "4.21.1",
-		"express-body-parser-error-handler": "1.0.7",
 		"grunt": "1.6.1",
 		"grunt-bowercopy": "1.2.5",
 		"grunt-compare-size": "0.4.2",
@@ -73,10 +67,9 @@
 		"grunt-eslint": "24.0.1",
 		"grunt-git-authors": "3.2.0",
 		"grunt-html": "17.1.0",
+		"jquery-test-runner": "0.2.1",
 		"load-grunt-tasks": "5.1.0",
-		"rimraf": "6.0.1",
-		"selenium-webdriver": "4.26.0",
-		"yargs": "17.7.2"
+		"rimraf": "6.0.1"
 	},
 	"keywords": []
 }

tests/lib/qunit.js

@@ -13,8 +13,6 @@ QUnit.config.requireExpects = true;
 QUnit.config.urlConfig.push( {
 	id: "jquery",
 	label: "jQuery version",
-
-	// Keep in sync with tests/runner/jquery.js
 	value: [
 		"1.12.4",
 		"2.2.4",