Build: Update testswarm task to node-testswarm 1.x API

diff --git a/Gruntfile.js b/Gruntfile.js
index c6b84568900c5286f1eba8fd3cf57ad5169b6aae..952515b46f05f5e985fe3324f7cd5fc965a08145 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -163,7 +163,8 @@ module.exports = function( grunt ) {
        grunt.registerTask( "testswarm", function( commit, configFile ) {
                var jobName,
                        testswarm = require( "testswarm" ),
-                       testUrls = [],
+                       runs = {},
+                       done = this.async(),
                        pull = /PR-(\d+)/.exec( commit ),
                        config = grunt.file.readJSON( configFile ).jquery,
                        tests = grunt.config([ this.name, "tests" ]);
@@ -177,23 +178,33 @@ module.exports = function( grunt ) {
                }
 
                tests.forEach(function( test ) {
-                       testUrls.push( config.testUrl + commit + "/test/index.html?module=" + test );
+                       runs[test] = config.testUrl + commit + "/test/index.html?module=" + test;
                });
 
-               testswarm({
+               // TODO: create separate job for git/git2 so we can do different browsersets
+               testswarm.createClient( {
                        url: config.swarmUrl,
                        pollInterval: 10000,
-                       timeout: 1000 * 60 * 30,
-                       done: this.async()
-               }, {
-                       authUsername: config.authUsername,
-                       authToken: config.authToken,
-                       jobName: jobName,
-                       runMax: config.runMax,
-                       "runNames[]": tests,
-                       "runUrls[]": testUrls,
-                       "browserSets[]": "popular-no-old-ie"
-               });
+                       timeout: 1000 * 60 * 30
+               } )
+               .addReporter( testswarm.reporters.cli )
+               .auth( {
+                       id: config.authUsername,
+                       token: config.authToken
+               })
+               .addjob(
+                       {
+                               name: jobName,
+                               runs: runs,
+                               runMax: config.runMax,
+                               browserSets: "popular-no-old-ie"
+                       }, function( err, passed ) {
+                               if ( err ) {
+                                       grunt.log.error( err );
+                               }
+                               done( passed );
+                       }
+               );
        });
 
        grunt.registerTask( "selector", "Build Sizzle-based selector module", function() {

diff --git a/package.json b/package.json
index ff831c6a3c93bd1bddbaa5553e96117be0ed6e23..982adde9432ecdac835cac2a9b897c3c7383ebd3 100644 (file)
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
                "grunt-contrib-uglify": "0.2.0",
                "grunt": "0.4.1",
                "gzip-js": "0.3.1",
-               "testswarm": "0.2.2",
+               "testswarm": "~1.1.0",
                "archiver": "~0.4.2"
        },
        "keywords": []