From 8d7e93cfc69e816b823579966b429ea72263c82b Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Thu, 22 Aug 2013 19:02:16 -0400
Subject: 2.6.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index c2e6d3d..5186842 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reveal.js",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "The HTML Presentation Framework",
   "homepage": "http://lab.hakim.se/reveal-js",
   "subdomain": "revealjs",
-- 
cgit v1.2.3


From a7b348e83b62fdfdf2a5d14ae98d84d46130dc04 Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Thu, 22 Aug 2013 19:06:41 -0400
Subject: add qunit grunt dependency

---
 Gruntfile.js | 1 +
 package.json | 1 +
 2 files changed, 2 insertions(+)

(limited to 'package.json')

diff --git a/Gruntfile.js b/Gruntfile.js
index 892469a..79e87b3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -109,6 +109,7 @@ module.exports = function(grunt) {
 	});
 
 	// Dependencies
+	grunt.loadNpmTasks( 'grunt-contrib-qunit' );
 	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
 	grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
 	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
diff --git a/package.json b/package.json
index 5186842..6326570 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "socket.io": "~0.9.13"
   },
   "devDependencies": {
+    "grunt-contrib-qunit": "~0.2.2",
     "grunt-contrib-jshint": "~0.2.0",
     "grunt-contrib-cssmin": "~0.4.1",
     "grunt-contrib-uglify": "~0.1.1",
-- 
cgit v1.2.3


From 502b26ecf02839bc24f9e47d08d5439aee24ad9c Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Thu, 22 Aug 2013 20:31:52 -0400
Subject: run unit tests as part of grunt build and ci

---
 Gruntfile.js | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/Gruntfile.js b/Gruntfile.js
index 79e87b3..5daa4e5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -119,7 +119,7 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks( 'grunt-zip' );
 
 	// Default task
-	grunt.registerTask( 'default', [ 'jshint', 'cssmin', 'uglify' ] );
+	grunt.registerTask( 'default', [ 'jshint', 'cssmin', 'uglify', 'qunit' ] );
 
 	// Theme task
 	grunt.registerTask( 'themes', [ 'sass' ] );
diff --git a/package.json b/package.json
index 6326570..2c7036e 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "homepage": "http://lab.hakim.se/reveal-js",
   "subdomain": "revealjs",
   "scripts": {
-    "test": "grunt jshint",
+    "test": "grunt jshint qunit",
     "start": ""
   },
   "author": {
-- 
cgit v1.2.3


From 1c8fd60595134b8501fa1b4d07dcc11d6ec65d8c Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Sat, 24 Aug 2013 10:52:35 -0400
Subject: add test task, avoid attempt to run tests in unrelated html files

---
 Gruntfile.js | 5 ++++-
 package.json | 2 +-
 test/test.js | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'package.json')

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 );
 	});
 
-- 
cgit v1.2.3


From d62093c228f13ed10a21eb7055872b97c9f2ef78 Mon Sep 17 00:00:00 2001
From: Hakim El Hattab
Date: Sat, 24 Aug 2013 15:10:10 -0400
Subject: include dev flag in version

---
 js/reveal.min.js | 2 +-
 package.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'package.json')

diff --git a/js/reveal.min.js b/js/reveal.min.js
index e0a1dc9..99bcd35 100644
--- a/js/reveal.min.js
+++ b/js/reveal.min.js
@@ -1,5 +1,5 @@
 /*!
- * reveal.js 2.6.0 (2013-08-23, 09:08)
+ * reveal.js 2.6.0-dev (2013-08-24, 15:09)
  * http://lab.hakim.se/reveal-js
  * MIT licensed
  *
diff --git a/package.json b/package.json
index caef3f9..8da6168 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reveal.js",
-  "version": "2.6.0",
+  "version": "2.6.0-dev",
   "description": "The HTML Presentation Framework",
   "homepage": "http://lab.hakim.se/reveal-js",
   "subdomain": "revealjs",
-- 
cgit v1.2.3