Merge pull request #667 from GitbookIO/better-testing

Better Unit Tests

1 files changed, 22 insertions, 26 deletions

diff --git a/test/templating.js b/test/templating.js
index 9165d7a..af29d25 100644
--- a/test/templating.js
+++ b/test/templating.js
@@ -1,37 +1,33 @@
-var path = require('path');
-var _ = require('lodash');
-var assert = require('assert');
-var fs = require("fs");
-
 var pkg = require("../package.json");
 
 describe('Templating', function () {
-    before(function(done) {
-        testGeneration(books[0], "website", function(output) {}, done);
+    var book;
+
+    before(function() {
+        return books.parse("basic")
+            .then(function(_book) {
+                book = _book;
+            });
     });
 
     var testTpl = function(str, args, options) {
-        return books[0].template.renderString(str, args, options)
-        .then(books[0].template.postProcess)
+        return book.template.renderString(str, args, options)
+        .then(book.template.postProcess)
     };
 
-    it('should correctly have access to generator', function(done) {
-        qdone(
-            testTpl('{{ gitbook.generator }}')
-            .then(function(content) {
-                assert.equal(content, "website");
-            }),
-            done
-        );
-    });
+    describe('Context', function() {
+        it('should correctly have access to generator', function() {
+            return testTpl('{{ gitbook.generator }}')
+                .then(function(content) {
+                    content.should.equal("website");
+                });
+        });
 
-    it('should correctly have access to gitbook version', function(done) {
-        qdone(
-            testTpl('{{ gitbook.version }}')
-            .then(function(content) {
-                assert.equal(content, pkg.version.toString());
-            }),
-            done
-        );
+        it('should correctly have access to gitbook version', function() {
+            return testTpl('{{ gitbook.version }}')
+                .then(function(content) {
+                    content.should.equal(pkg.version.toString());
+                });
+        });
     });
 });