Merge branch 'master' into selectmenu

3 files changed, 26 insertions, 23 deletions

diff --git a/build/release/release.js b/build/release/release.js
index 2eab5283f..159345b99 100644
--- a/build/release/release.js
+++ b/build/release/release.js
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/*global cat:true cd:true echo:true exec:true exit:true*/
+/* global cat:true, cd:true, echo:true, exec:true, exit:true */
 
 // Usage:
 // stable release: node release.js
diff --git a/build/tasks/build.js b/build/tasks/build.js
index 978bee004..09243cfb6 100644
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -140,7 +140,7 @@ grunt.registerMultiTask( "zip", "Create a zip file for release", function() {
 		cmd: "zip",
 		args: [ "-r", dest, this.data.src ],
 		opts: {
-			cwd: 'dist'
+			cwd: "dist"
 		}
 	}, function( err ) {
 		if ( err ) {
diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 3166e9277..825b23b0c 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -34,37 +34,40 @@ var versions = {
 		"Widget": "widget/widget.html"
 	};
 
-function submit( commit, runs, configFile, version, done ) {
+function submit( commit, runs, configFile, extra, done ) {
 	var testName,
 		testswarm = require( "testswarm" ),
-		config = grunt.file.readJSON( configFile ).jqueryui;
-	version = version ? ( version + " " ) : "";
+		config = grunt.file.readJSON( configFile ).jqueryui,
+		commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit;
+
+	if ( extra ) {
+		extra = " " + extra;
+	}
+
 	for ( testName in runs ) {
-		runs[ testName] = config.testUrl + commit + "/tests/unit/" + runs[ testName ];
+		runs[ testName ] = config.testUrl + commit + "/tests/unit/" + runs[ testName ];
 	}
-	testswarm.createClient( {
+	testswarm.createClient({
 		url: config.swarmUrl,
 		pollInterval: 10000,
 		timeout: 1000 * 60 * 45
-	} )
+	})
 	.addReporter( testswarm.reporters.cli )
-	.auth( {
+	.auth({
 		id: config.authUsername,
 		token: config.authToken
-	} )
-	.addjob(
-		{
-			name: 'jQuery UI ' + version + '#<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
-			runs: runs,
-			runMax: config.runMax,
-			browserSets: config.browserSets
-		}, function( err, passed ) {
-			if ( err ) {
-				grunt.log.error( err );
-			}
-			done( passed );
+	})
+	.addjob({
+		name: "jQuery UI #<a href='" + commitUrl + "'>" + commit.substr( 0, 10 ) + "</a>" + extra,
+		runs: runs,
+		runMax: config.runMax,
+		browserSets: config.browserSets
+	}, function( error, passed ) {
+		if ( error ) {
+			grunt.log.error( error );
 		}
-	);
+		done( passed );
+	});
 }
 
 grunt.registerTask( "testswarm", function( commit, configFile ) {
@@ -83,7 +86,7 @@ grunt.registerTask( "testswarm-multi-jquery", function( commit, configFile, mino
 			allTests[ test + "-" + version ] = tests[ test ] + "?nojshint=true&jquery=" + version;
 		}
 	});
-	submit( commit, allTests, configFile, minor + " core", this.async() );
+	submit( commit, allTests, configFile, "core " + minor, this.async() );
 });
 
 };