Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tests: Migrate test runner to jquery-test-runner #2325

Merged
merged 12 commits into from
Jan 14, 2025
2 changes: 1 addition & 1 deletion .github/workflows/filestash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
42 changes: 18 additions & 24 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 }}
38 changes: 38 additions & 0 deletions jtr-git.yml
Original file line number Diff line number Diff line change
@@ -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
40 changes: 40 additions & 0 deletions jtr-stable.yml
Original file line number Diff line number Diff line change
@@ -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
30 changes: 30 additions & 0 deletions jtr.yml
Original file line number Diff line number Diff line change
@@ -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
17 changes: 5 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": []
}
2 changes: 0 additions & 2 deletions tests/lib/qunit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
38 changes: 0 additions & 38 deletions tests/runner/.eslintrc.json

This file was deleted.

Loading
Loading