Merge branch 'release/1.0'

OpenMTC · Aug 13, 2016 · cc897a9 · cc897a9
2 parents f110fe4 + 199f7ba
commit cc897a9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/lib/loadData.js b/lib/loadData.js
@@ -8,7 +8,7 @@ var yaml  = require('js-yaml');
  * @param {string} dir - Folder to check for data files.
  */
 module.exports = function(dir) {
-  var dataFiles = utils.loadFiles(dir, '*.{js,json,yml}');
+  var dataFiles = utils.loadFiles(dir, '**/*.{js,json,yml}');
 
   for (var i in dataFiles) {
     var file = fs.readFileSync(dataFiles[i]);

diff --git a/test/fixtures/data-json/data/breakfast.json → ...s/data-json/data/subfolder/breakfast.json b/test/fixtures/data-json/data/breakfast.json → ...s/data-json/data/subfolder/breakfast.json