Commit 672d7e05 authored by Tristan Cavelier's avatar Tristan Cavelier

qunit works with grunt now

parent 62947ca8
...@@ -89,8 +89,10 @@ module.exports = function (grunt) { ...@@ -89,8 +89,10 @@ module.exports = function (grunt) {
}, },
qunit: { qunit: {
// grunt doesn't like requirejs // grunt doesn't like requirejs
// phantomjs daesn't know Blobs !! files: ['test/tests.html'],
files: ['test/tests.html'] options: {
timeout: 30000 // if no test occurs for 30 seconds, then timeout
}
} }
}); });
...@@ -99,7 +101,7 @@ module.exports = function (grunt) { ...@@ -99,7 +101,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.registerTask('default', ['jslint', 'concat', 'uglify']); //, 'qunit']); grunt.registerTask('default', ['jslint', 'concat', 'uglify', 'qunit']);
grunt.registerTask('lint', ['jslint']); grunt.registerTask('lint', ['jslint']);
grunt.registerTask('build', ['concat', 'uglify']); grunt.registerTask('build', ['concat', 'uglify']);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment