1 files changed, 23 insertions, 14 deletions

diff --git a/test/generation.js b/test/generation.js
index 6bfb095..b043885 100644
--- a/test/generation.js
+++ b/test/generation.js
@@ -2,26 +2,35 @@ var path = require('path');
 var _ = require('lodash');
 var assert = require('assert');
 
-var fs = require('../lib/utils/fs');
+var fs = require("fs");
+var fsUtil = require("../lib/utils/fs");
+
+var testGeneration = function(book, type, func, done) {
+    var OUTPUT_PATH = book.options.output;
+
+    qdone(
+        book.generate(type)
+            .then(function() {
+                func(OUTPUT_PATH);
+            })
+            .fin(function() {
+                return fsUtil.remove(OUTPUT_PATH);
+            }),
+        done);
+};
+
 
 describe('Book generation', function () {
     it('should correctly generate a book to json', function(done) {
-    	var OUTPUT_PATH = book1.options.output;
-
-        qdone(
-        	book1.generate("json")
-	        .fin(function() {
-	        	return fs.remove(OUTPUT_PATH);
-	        }), done);
+    	testGeneration(book1, "json", function(output) {
+            assert(!fs.existsSync(path.join(output, "README.json")));
+            assert(fs.existsSync(path.join(output, "intro.json")))
+        }, done);
     });
 
     it('should correctly generate a multilingual book to json', function(done) {
-    	var OUTPUT_PATH = book2.options.output;
+    	testGeneration(book2, "json", function(output) {
 
-        qdone(
-        	book2.generate("json")
-	        .fin(function() {
-	        	return fs.remove(OUTPUT_PATH);
-	        }), done);
+        }, done);
     });
 });