Skip to content

Commit cc2c5da

Browse files
committed
Build: Allow to pass browserSets & jQuery version to testswarm task
So far, Migrate has been tested only on browsers supported by jQuery 2.x. This commit changes the configuration so that different browserSets can be tested with jQuery 2.x and 1.x. Closes jquerygh-59
1 parent 57d34d5 commit cc2c5da

File tree

1 file changed

+28
-15
lines changed

1 file changed

+28
-15
lines changed

Gruntfile.js

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,24 @@ module.exports = function(grunt) {
2828
"src/event.js",
2929
"src/outro.js"
3030
],
31-
tests: [
32-
"dev+git",
33-
"dev+git2",
34-
"min+git",
35-
"min+git2",
36-
"dev+2.0.3",
37-
"dev+1.10.2",
38-
"dev+1.9.1",
39-
"dev+1.8.3",
40-
"dev+1.7.2",
41-
"dev+1.6.4"
42-
],
31+
tests: {
32+
1: [
33+
"dev+git",
34+
"min+git",
35+
"dev+1.11.1",
36+
"dev+1.10.2",
37+
"dev+1.9.1",
38+
"dev+1.8.3",
39+
"dev+1.7.2",
40+
"dev+1.6.4"
41+
],
42+
2: [
43+
"dev+git2",
44+
"min+git2",
45+
"dev+2.1.1",
46+
"dev+2.0.3"
47+
]
48+
},
4349
banners: {
4450
tiny: "/*! <%= pkg.name %> <%= pkg.version %> - <%= pkg.homepage %> */"
4551
},
@@ -108,14 +114,21 @@ module.exports = function(grunt) {
108114
grunt.registerTask( "buildnounit", [ "concat", "uglify", "jshint" ] );
109115

110116
// Testswarm
111-
grunt.registerTask( "testswarm", function( commit, configFile ) {
117+
grunt.registerTask( "testswarm", function( commit, configFile, browserSets,
118+
jQueryVersion ) {
112119
var jobName,
113120
testswarm = require( "testswarm" ),
114121
runs = {},
115122
done = this.async(),
116123
pull = /PR-(\d+)/.exec( commit ),
117124
config = grunt.file.readJSON( configFile ).jquerymigrate,
118-
tests = grunt.config("tests");
125+
tests = grunt.config( "tests"[ jQueryVersion ] );
126+
127+
browserSets = browserSets || config.browserSets;
128+
if ( browserSets[ 0 ] === "[" ) {
129+
// We got an array, parse it
130+
browserSets = JSON.parse( browserSets );
131+
}
119132

120133
if ( pull ) {
121134
jobName = "Pull <a href='https://github.com/jquery/jquery-migrate/pull/" +
@@ -145,7 +158,7 @@ module.exports = function(grunt) {
145158
name: jobName,
146159
runs: runs,
147160
runMax: config.runMax,
148-
browserSets: "popular-no-old-ie",
161+
browserSets: browserSets,
149162
timeout: 1000 * 60 * 30
150163
}, function( err, passed ) {
151164
if ( err ) {

0 commit comments

Comments
 (0)