aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHakim El Hattab <hakim.elhattab@gmail.com>2013-08-24 10:52:35 -0400
committerHakim El Hattab <hakim.elhattab@gmail.com>2013-08-24 10:52:35 -0400
commit1c8fd60595134b8501fa1b4d07dcc11d6ec65d8c (patch)
treef9ad3aa4d3b1dc8b89165fc0c6aeca7c76cbdb9a
parent7f85c2138603d5c869c3c9a3713bfa0b1e7a08f8 (diff)
downloadfreenode-live-2017-presentation-1c8fd60595134b8501fa1b4d07dcc11d6ec65d8c.tar
freenode-live-2017-presentation-1c8fd60595134b8501fa1b4d07dcc11d6ec65d8c.tar.gz
add test task, avoid attempt to run tests in unrelated html files
-rw-r--r--Gruntfile.js5
-rw-r--r--package.json2
-rw-r--r--test/test.js3
3 files changed, 7 insertions, 3 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 5daa4e5..4df3181 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,7 +17,7 @@ module.exports = function(grunt) {
// Tests will be added soon
qunit: {
- files: [ 'test/**/*.html' ]
+ files: [ 'test/*.html' ]
},
uglify: {
@@ -130,4 +130,7 @@ module.exports = function(grunt) {
// Serve presentation locally
grunt.registerTask( 'serve', [ 'connect', 'watch' ] );
+ // Run tests
+ grunt.registerTask( 'test', [ 'jshint', 'qunit' ] );
+
};
diff --git a/package.json b/package.json
index 2c7036e..caef3f9 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"homepage": "http://lab.hakim.se/reveal-js",
"subdomain": "revealjs",
"scripts": {
- "test": "grunt jshint qunit",
+ "test": "grunt test",
"start": ""
},
"author": {
diff --git a/test/test.js b/test/test.js
index 08c5c37..00c9622 100644
--- a/test/test.js
+++ b/test/test.js
@@ -206,7 +206,6 @@ Reveal.addEventListener( 'ready', function() {
asyncTest( 'fragmentshown event', function() {
expect( 2 );
- start();
var _onEvent = function( event ) {
ok( true, 'event fired' );
@@ -221,6 +220,8 @@ Reveal.addEventListener( 'ready', function() {
Reveal.next();
Reveal.prev(); // shouldn't fire fragmentshown
+ start();
+
Reveal.removeEventListener( 'fragmentshown', _onEvent );
});