From a6b92876f7853c87af4b17b980d52ada03b9bbc9 Mon Sep 17 00:00:00 2001
From: Alexander <alykoshin@gmail.com>
Date: Fri, 22 Jan 2016 13:16:09 +0300
Subject: [PATCH] test fixes

---
 test/07_indexAsParent/input/merge_js_json2/index.js   | 9 +++++++++
 test/07_indexAsParent/input/merge_js_json2/index.json | 4 ++++
 test/index.js                                         | 8 ++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 test/07_indexAsParent/input/merge_js_json2/index.js
 create mode 100644 test/07_indexAsParent/input/merge_js_json2/index.json

diff --git a/test/07_indexAsParent/input/merge_js_json2/index.js b/test/07_indexAsParent/input/merge_js_json2/index.js
new file mode 100644
index 0000000..6862ebd
--- /dev/null
+++ b/test/07_indexAsParent/input/merge_js_json2/index.js
@@ -0,0 +1,9 @@
+/**
+ * Created by alykoshin on 21.01.16.
+ */
+
+// Export object
+module.exports = 'string exported from merge_js_json/index.js';
+
+
+
diff --git a/test/07_indexAsParent/input/merge_js_json2/index.json b/test/07_indexAsParent/input/merge_js_json2/index.json
new file mode 100644
index 0000000..100a234
--- /dev/null
+++ b/test/07_indexAsParent/input/merge_js_json2/index.json
@@ -0,0 +1,4 @@
+{
+  "prop_json": "string exported from merge_js_json/index.json",
+  "prop": "string exported from merge_js_json/index.json"
+}
diff --git a/test/index.js b/test/index.js
index 6e5962d..7aac535 100644
--- a/test/index.js
+++ b/test/index.js
@@ -244,6 +244,14 @@ describe('#indexAsParent test', function() {
     modules.dir5.dir51.should.eql(index51);
   });
 
+  it('should merge .js and .json', function() {
+    var js = require(root+'merge_js_json/index.js');
+    var json = require(root+'merge_js_json/index.json');
+    modules.merge_js_json.should.contain.keys(js);
+    modules.merge_js_json.prop_js.should.be.eql(js.prop_js);
+    modules.merge_js_json.should.contain(json);
+  });
+
   it('should merge dir and file', function() {
     var index0 = require(root+'merge_dir_file/test/index');
     var index1 = require(root+'merge_dir_file/test');