test fixes

alykoshin · Jan 22, 2016 · a6b9287 · a6b9287
1 parent c11fe8d
commit a6b9287
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/test/07_indexAsParent/input/merge_js_json2/index.js 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
@@ -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
@@ -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');