Skip to content

Commit 4922034

Browse files
committed
Build: Test on jQuery 4.x separately to jQuery 3.x
Having separate test runs for those jQuery lines is necessary as they support different browsers. Android 4.0 fails hard when run against jQuery master code.
1 parent bccaa47 commit 4922034

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

Gruntfile.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ module.exports = function( grunt ) {
3030
tests: {
3131
jquery: [
3232
"dev+git",
33-
"min+git.min",
33+
"min+git.min"
34+
],
35+
"jquery-3": [
3436
"dev+3.x-git",
3537
"min+3.x-git.min",
38+
"dev+3.5.0",
3639
"dev+3.4.1",
3740
"dev+3.3.1",
3841
"dev+3.2.1",

build/tasks/testswarm.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ module.exports = function( grunt ) {
1919
browserSets = JSON.parse( browserSets );
2020
}
2121
timeout = timeout || 1000 * 60 * 15;
22-
tests = grunt.config( "tests" ).jquery;
22+
tests = grunt.config( "tests" )[
23+
Array.isArray( browserSets ) ? browserSets[ 0 ] : browserSets ||
24+
"jquery" ];
2325

2426
if ( pull ) {
2527
jobName = "Pull <a href='https://github.com/jquery/jquery-migrate/pull/" +

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"grunt-contrib-watch": "1.1.0",
3737
"grunt-eslint": "21.0.0",
3838
"grunt-karma": "3.0.2",
39-
"jquery": "3.4.1",
39+
"jquery": "3.5.0",
4040
"karma": "4.1.0",
4141
"karma-browserstack-launcher": "1.5.1",
4242
"karma-chrome-launcher": "2.2.0",

0 commit comments

Comments
 (0)