Skip to content

Commit a2ad1df

Browse files
authored
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. git.min & 3.5.0 versions were also added to aid manual testing. Closes jquery#336
1 parent bccaa47 commit a2ad1df

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

Gruntfile.js

+4-1
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

+3-1
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

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
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",

test/testinit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ TestManager = {
157157
TestManager.init( {
158158
"jquery": {
159159
urlTag: "jquery",
160-
choices: "dev,min,git,3.x-git,3.x-git.min,3.4.1,3.3.1,3.2.1,3.1.1,3.0.0"
160+
choices: "dev,min,git,git.min,3.x-git,3.x-git.min,3.5.0,3.4.1,3.3.1,3.2.1,3.1.1,3.0.0"
161161
},
162162
"jquery-migrate": {
163163
urlTag: "plugin",

0 commit comments

Comments
 (0)