Add test for loading configuration from book.js

3 files changed, 15 insertions, 1 deletions

diff --git a/test/configuration.js b/test/configuration.js
index 6540d34..57bead9 100644
--- a/test/configuration.js
+++ b/test/configuration.js
@@ -5,7 +5,7 @@ var Book = require('../').Book;
 
 describe('Configuration parsing', function () {
     it('should correctly load from json', function(done) {
-        var book = new Book(path.join(__dirname, './fixtures/config'));
+        var book = new Book(path.join(__dirname, './fixtures/configuration/json'));
         book.config.load()
         .then(function() {
         	assert(book.options.title == "Test");
@@ -14,4 +14,15 @@ describe('Configuration parsing', function () {
         	done()
         }, done);
     });
+
+    it('should correctly load from javascript', function(done) {
+        var book = new Book(path.join(__dirname, './fixtures/configuration/js'));
+        book.config.load()
+        .then(function() {
+        	assert(book.options.title == "Test 2");
+        })
+        .then(function() {
+        	done()
+        }, done);
+    });
 });
diff --git a/test/fixtures/configuration/js/book.js b/test/fixtures/configuration/js/book.js
new file mode 100644
index 0000000..bf617cd
--- /dev/null
+++ b/test/fixtures/configuration/js/book.js
@@ -0,0 +1,3 @@
+module.exports = {
+	title: "Test 2"
+};
diff --git a/test/fixtures/config/book.json b/test/fixtures/configuration/json/book.json
index a2191b8..a2191b8 100644
--- a/test/fixtures/config/book.json
+++ b/test/fixtures/configuration/json/book.json