Add a test for loading tests asynchronously

[qunit.git] / grunt.js

diff --git a/grunt.js b/grunt.js
index ad26191..ad60639 100644 (file)
--- a/grunt.js
+++ b/grunt.js
@@ -12,69 +12,52 @@ grunt.initConfig({
                        'addons/canvas/canvas.html',
                        'addons/close-enough/close-enough.html',
                        'addons/composite/composite-demo-test.html'
                        'addons/canvas/canvas.html',
                        'addons/close-enough/close-enough.html',
                        'addons/composite/composite-demo-test.html'

-               ]
+               ],
+               async: 'test/async.html'

        },
        lint: {
                qunit: 'qunit/qunit.js',
        },
        lint: {
                qunit: 'qunit/qunit.js',

-               // addons: 'addons/**/*.js',
+               addons: 'addons/**.js',

                grunt: 'grunt.js'
                grunt: 'grunt.js'

-               // TODO need to figure out which warnings to fix and which to disable
-               // tests: 'test/test.js'
+               // TODO fix remaining warnings
+               // tests: 'test/**.js'

        },
        },

-       jshint: {
-               qunit: {
-                       options: {
-                               onevar: true,
-                               browser: true,
-                               bitwise: true,
-                               curly: true,
-                               trailing: true,
-                               immed: true,
-                               latedef: false,
-                               newcap: true,
-                               noarg: false,
-                               noempty: true,
-                               nonew: true,
-                               sub: true,
-                               undef: true,
-                               eqnull: true,
-                               proto: true,
-                               smarttabs: true
-                       },
-                       globals: {
-                               jQuery: true,
-                               exports: 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: {
+       // TODO rmeove this one grunt 0.4 is out, see jquery-ui for other details
+       jshint: (function() {
+               function parserc( path ) {
+                       var rc = grunt.file.readJSON( (path || "") + ".jshintrc" ),
+                               settings = {
+                                       options: rc,
+                                       globals: {}
+                               };
+
+                       (rc.predef || []).forEach(function( prop ) {
+                               settings.globals[ prop ] = true;
+                       });
+                       delete rc.predef;
+
+                       return settings;

                }
                }

+
+               return {
+                       addons: parserc( "addons/" ),
+                       qunit: parserc( "qunit/" ),
+                       tests: parserc( "test/" )
+               };
+       })()
+});
+
+grunt.registerTask( "build-git", function( sha ) {
+       function processor( content ) {
+               var tagline = " - A JavaScript Unit Testing Framework";
+               return content.replace( tagline, "-" + sha + " " + grunt.template.today('isoDate') + tagline );

        }
        }

+       grunt.file.copy( "qunit/qunit.css", "dist/qunit-git.css", {
+               process: processor
+       });
+       grunt.file.copy( "qunit/qunit.js", "dist/qunit-git.js", {
+               process: processor
+       });

 });
 
 grunt.registerTask( "testswarm", function( commit, configFile ) {
 });
 
 grunt.registerTask( "testswarm", function( commit, configFile ) {


@@ -83,6 +66,7 @@ grunt.registerTask( "testswarm", function( commit, configFile ) {
        testswarm({
                url: config.swarmUrl,
                pollInterval: 10000,
        testswarm({
                url: config.swarmUrl,
                pollInterval: 10000,

+               timeout: 1000 * 60 * 30,

                done: this.async()
        }, {
                authUsername: "qunit",
                done: this.async()
        }, {
                authUsername: "qunit",