From 7869891a97eae93699cc239274e73e53daedf781 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski?= Date: Tue, 15 Apr 2014 11:34:02 +0200 Subject: [PATCH] Build: use browserSets from config file; allow to override --- build/tasks/testswarm.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index 1e4e04531..91abf2794 100644 --- a/build/tasks/testswarm.js +++ b/build/tasks/testswarm.js @@ -2,7 +2,8 @@ module.exports = function( grunt ) { "use strict"; - grunt.registerTask( "testswarm", function( commit, configFile, projectName ) { + grunt.registerTask( "testswarm", function( commit, configFile, projectName, browserSets, + timeout ) { var jobName, config, tests, testswarm = require( "testswarm" ), runs = {}, @@ -11,6 +12,12 @@ module.exports = function( grunt ) { projectName = projectName || "jquery"; config = grunt.file.readJSON( configFile )[ projectName ]; + browserSets = browserSets || config.browserSets; + if ( browserSets[ 0 ] === "[" ) { + // We got an array, parse it + browserSets = JSON.parse( browserSets ); + } + timeout = timeout || 1000 * 60 * 30; tests = grunt.config([ this.name, "tests" ]); if ( pull ) { @@ -38,10 +45,8 @@ module.exports = function( grunt ) { name: jobName, runs: runs, runMax: config.runMax, - browserSets: projectName === "jqueryweekly" ? - "weekly-no-old-ie" : - [ "popular-no-old-ie", "ios" ], - timeout: projectName === "jqueryweekly" ? 1000 * 60 * 60 : 1000 * 60 * 30 + browserSets: browserSets, + timeout: timeout }, function( err, passed ) { if ( err ) { grunt.log.error( err ); -- 2.39.5