@@ -4,6 +4,7 @@ module.exports = function( grunt ) {
4
4
5
5
var versions = {
6
6
"git" : "git" ,
7
+ "1.9" : "1.9.0 1.9.1" ,
7
8
"1.8" : "1.8.0 1.8.1 1.8.2 1.8.3" ,
8
9
"1.7" : "1.7 1.7.1 1.7.2" ,
9
10
"1.6" : "1.6 1.6.1 1.6.2 1.6.3 1.6.4"
@@ -34,29 +35,39 @@ var versions = {
34
35
"Widget" : "widget/widget.html"
35
36
} ;
36
37
37
- function submit ( commit , tests , configFile , version , done ) {
38
- var test ,
38
+ function submit ( commit , runs , configFile , extra , done ) {
39
+ var testName ,
39
40
testswarm = require ( "testswarm" ) ,
40
41
config = grunt . file . readJSON ( configFile ) . jqueryui ,
41
- testBase = config . testUrl + commit + "/tests/unit/" ,
42
- testUrls = [ ] ;
43
- for ( test in tests ) {
44
- testUrls . push ( testBase + tests [ test ] ) ;
42
+ commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit ;
43
+
44
+ if ( extra ) {
45
+ extra = " " + extra ;
45
46
}
46
- version = version ? ( version + " " ) : "" ;
47
- testswarm ( {
47
+
48
+ for ( testName in runs ) {
49
+ runs [ testName ] = config . testUrl + commit + "/tests/unit/" + runs [ testName ] ;
50
+ }
51
+ testswarm . createClient ( {
48
52
url : config . swarmUrl ,
49
53
pollInterval : 10000 ,
50
- timeout : 1000 * 60 * 45 ,
51
- done : done
52
- } , {
53
- authUsername : config . authUsername ,
54
- authToken : config . authToken ,
55
- jobName : 'jQuery UI 1-9 ' + version + '#<a href="https://github.com/jquery/jquery-ui/commit/' + commit + '">' + commit . substr ( 0 , 10 ) + '</a>' ,
54
+ timeout : 1000 * 60 * 45
55
+ } )
56
+ . addReporter ( testswarm . reporters . cli )
57
+ . auth ( {
58
+ id : config . authUsername ,
59
+ token : config . authToken
60
+ } )
61
+ . addjob ( {
62
+ name : "jQuery UI 1-9 #<a href='" + commitUrl + "'>" + commit . substr ( 0 , 10 ) + "</a>" + extra ,
63
+ runs : runs ,
56
64
runMax : config . runMax ,
57
- "runNames[]" : Object . keys ( tests ) ,
58
- "runUrls[]" : testUrls ,
59
- "browserSets[]" : [ "popular" ]
65
+ browserSets : config . browserSets
66
+ } , function ( error , passed ) {
67
+ if ( error ) {
68
+ grunt . log . error ( error ) ;
69
+ }
70
+ done ( passed ) ;
60
71
} ) ;
61
72
}
62
73
@@ -76,7 +87,7 @@ grunt.registerTask( "testswarm-multi-jquery", function( commit, configFile, mino
76
87
allTests [ test + "-" + version ] = tests [ test ] + "?nojshint=true&jquery=" + version ;
77
88
}
78
89
} ) ;
79
- submit ( commit , allTests , configFile , minor + " core" , this . async ( ) ) ;
90
+ submit ( commit , allTests , configFile , " core " + minor , this . async ( ) ) ;
80
91
} ) ;
81
92
82
93
} ;
0 commit comments