From b6857536606d5d0dd1b07ada519f845cdac5c96e Mon Sep 17 00:00:00 2001
From: Timmy Willison <timmywil@users.noreply.github.com>
Date: Tue, 14 Jan 2025 05:15:49 -0500
Subject: Tests: Migrate test runner to jquery-test-runner

Closes gh-2325
---
 .github/workflows/filestash.yml |  2 +-
 .github/workflows/node.js.yml   | 42 ++++++++++++++++++-----------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/filestash.yml b/.github/workflows/filestash.yml
index 8253df1ae..8de197a66 100644
--- a/.github/workflows/filestash.yml
+++ b/.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
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index bbabfb878..f23498ffd 100644
--- a/.github/workflows/node.js.yml
+++ b/.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:
@@ -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
@@ -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
@@ -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 }}
-- 
cgit v1.2.3