X-Git-Url: http://git.altlug.ru/?p=qunit.git;a=blobdiff_plain;f=grunt.js;h=2508ba5109d1921def713088de7435975eb868bb;hp=9c6ce6c983cd0f12f977f71a55130755b7907103;hb=cfc37752b32c6705be421bbacd163454bc0d0236;hpb=bc1d5199381fda4a9982161d3383685de380f3d6

diff --git a/grunt.js b/grunt.js
index 9c6ce6c..2508ba5 100644
--- a/grunt.js
+++ b/grunt.js
@@ -5,13 +5,19 @@ grunt.initConfig({
 	pkg: '<json:package.json>',
 	qunit: {
 		// TODO include 'test/logs.html' as well
-		files: ['test/index.html']
+		qunit: 'test/index.html',
+		addons: [
+			'addons/canvas/canvas.html',
+			'addons/close-enough/close-enough.html',
+			'addons/composite/composite-demo-test.html'
+		]
 	},
 	lint: {
 		qunit: 'qunit/qunit.js',
+		addons: 'addons/**/*.js',
 		grunt: 'grunt.js'
 		// TODO need to figure out which warnings to fix and which to disable
-		// tests: 'test/*.js'
+		// tests: 'test/test.js'
 	},
 	jshint: {
 		qunit: {
@@ -37,22 +43,55 @@ grunt.initConfig({
 				exports: true
 			}
 		},
-		tests: {
-			tests: {
-				globals: {
-					module: true,
-					test: true,
-					ok: true,
-					equal: true,
-					deepEqual: true,
-					QUnit: true
-				}
+		addons: {
+			options: {
+				browser: true,
+				curly: true,
+				eqnull: true,
+				eqeqeq: true,
+				expr: true,
+				evil: true,
+				jquery: true,
+				latedef: true,
+				noarg: true,
+				onevar: true,
+				smarttabs: true,
+				trailing: true,
+				undef: true
+			},
+			globals: {
+				module: true,
+				test: true,
+				asyncTest: true,
+				expect: true,
+				start: true,
+				stop: true,
+				QUnit: true
 			}
+		},
+		tests: {
 		}
 	}
 });
 
-// Default task.
+grunt.registerTask( "testswarm", function( commit, configFile ) {
+	var testswarm = require( "testswarm" ),
+		config = grunt.file.readJSON( configFile );
+	testswarm({
+		url: "http://swarm.jquery.org/",
+		pollInterval: 10000,
+		done: this.async()
+	}, {
+		authUsername: "qunit",
+		authToken: config.qunit.authToken,
+		jobName: 'QUnit commit #<a href="https://github.com/jquery/qunit/commit/' + commit + '">' + commit.substr( 0, 10 ) + '</a>',
+		runMax: 3,
+		"runNames[]": "QUnit",
+		"runUrls[]": "http://swarm.jquery.org/git/qunit/" + commit + "/test/index.html",
+		"browserSets[]": ["popular"]
+	});
+});
+
 grunt.registerTask('default', 'lint qunit');
 
 };