Merge branch 'master' into selectmenu

1 files changed, 37 insertions, 32 deletions

diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index c0244ebad..29dd74b87 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -1,33 +1,38 @@
 /*jshint node: true */
 module.exports = function( grunt ) {
 
-var tests = {
-	"Accordion": "accordion/accordion.html",
-	"Accordion_deprecated": "accordion/accordion_deprecated.html",
-	"Autocomplete": "autocomplete/autocomplete.html",
-	"Button": "button/button.html",
-	"Core": "core/core.html",
-	//"datepicker/datepicker.html",
-	//"dialog/dialog.html",
-	//"draggable/draggable.html",
-	//"droppable/droppable.html",
-	"Effects": "effects/effects.html",
-	"Menu": "menu/menu.html",
-	"Position": "position/position.html",
-	"Position_deprecated": "position/position_deprecated.html",
-	"Progressbar": "progressbar/progressbar.html",
-	//"resizable/resizable.html",
-	//"selectable/selectable.html",
-	//"slider/slider.html",
-	//"sortable/sortable.html",
-	"Spinner": "spinner/spinner.html",
-	"Tabs": "tabs/tabs.html",
-	"Tabs_deprecated": "tabs/tabs_deprecated.html",
-	"Tooltip": "tooltip/tooltip.html",
-	"Widget": "widget/widget.html"
-};
+var versions = {
+		"git": "git",
+		"1.7": "1.7 1.7.1 1.7.2",
+		"1.6": "1.6 1.6.1 1.6.2 1.6.3 1.6.4"
+	},
+	tests = {
+		"Accordion": "accordion/accordion.html",
+		"Accordion_deprecated": "accordion/accordion_deprecated.html",
+		"Autocomplete": "autocomplete/autocomplete.html",
+		"Button": "button/button.html",
+		"Core": "core/core.html",
+		//"datepicker/datepicker.html",
+		//"dialog/dialog.html",
+		//"draggable/draggable.html",
+		//"droppable/droppable.html",
+		"Effects": "effects/effects.html",
+		"Menu": "menu/menu.html",
+		"Position": "position/position.html",
+		"Position_deprecated": "position/position_deprecated.html",
+		"Progressbar": "progressbar/progressbar.html",
+		//"resizable/resizable.html",
+		//"selectable/selectable.html",
+		//"slider/slider.html",
+		//"sortable/sortable.html",
+		"Spinner": "spinner/spinner.html",
+		"Tabs": "tabs/tabs.html",
+		"Tabs_deprecated": "tabs/tabs_deprecated.html",
+		"Tooltip": "tooltip/tooltip.html",
+		"Widget": "widget/widget.html"
+	};
 
-function submit( commit, tests, configFile, done ) {
+function submit( commit, tests, configFile, version, done ) {
 	var test,
 		testswarm = require( "testswarm" ),
 		config = grunt.file.readJSON( configFile ).jqueryui,
@@ -39,12 +44,12 @@ function submit( commit, tests, configFile, done ) {
 	testswarm({
 		url: config.swarmUrl,
 		pollInterval: 10000,
-		timeout: 1000 * 60 * 30,
+		timeout: 1000 * 60 * 45,
 		done: done
 	}, {
 		authUsername: config.authUsername,
 		authToken: config.authToken,
-		jobName: 'jQuery UI commit #<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
+		jobName: 'jQuery UI ' + version + '<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit.substr( 0, 7 ) + '</a>',
 		runMax: config.runMax,
 		"runNames[]": Object.keys(tests),
 		"runUrls[]": testUrls,
@@ -58,17 +63,17 @@ grunt.registerTask( "testswarm", function( commit, configFile ) {
 	for ( test in tests ) {
 		latestTests[ test ] = tests[ test ] + "?nojshint=true";
 	}
-	submit( commit, latestTests, configFile, this.async() );
+	submit( commit, latestTests, configFile, "", this.async() );
 });
 
-grunt.registerTask( "testswarm-multi-jquery", function( commit, configFile ) {
+grunt.registerTask( "testswarm-multi-jquery", function( commit, configFile, minor ) {
 	var allTests = {};
-	"1.6 1.6.1 1.6.2 1.6.3 1.6.4 1.7 1.7.1 1.7.2 git".split(" ").forEach(function( version ) {
+	versions[ minor ].split(" ").forEach(function( version ) {
 		for ( var test in tests ) {
 			allTests[ test + "-" + version ] = tests[ test ] + "?nojshint=true&jquery=" + version;
 		}
 	});
-	submit( commit, allTests, configFile, this.async() );
+	submit( commit, allTests, configFile, minor + " core ", this.async() );
 });
 
 };