Merge branch '685-listitem-data' into dev

Author: bmuenzenmeyer

core/lib/patternlab.js

@@ -504,7 +504,7 @@ var patternlab_engine = function (config) {
       patternlab.data = {};
     }
     try {
-      patternlab.listitems = dataLoader.loadDataFromFile(path.resolve(paths.source.data, 'listitems.{json,yml,yaml}'));
+      patternlab.listitems = dataLoader.loadDataFromFile(path.resolve(paths.source.data, 'listitems'), fs);
     } catch (ex) {
       plutils.warning('WARNING: missing or malformed ' + paths.source.data + 'listitems file.  Pattern Lab may not work without this file.');
       patternlab.listitems = {};

test/files/_patterns/00-test/685-list.mustache

@@ -0,0 +1,3 @@
+{{#listItems.three}}
+{{title}}
+{{/listItems.three}}

test/pattern_assembler_tests.js

@@ -456,6 +456,40 @@ tap.test('processPatternRecursive - ensure deep-nesting works', function(test) {
   test.end();
 });
 
+tap.test('processPatternRecursive - 685 ensure listitems data is used', function(test) {
+  //arrange
+  var pattern_assembler = new pa();
+  var util = require('./util/test_utils.js');
+  var testPatternsPath = path.resolve(__dirname, 'files', '_patterns');
+  var pl = util.fakePatternLab(testPatternsPath);
+  pl.data.title = "0";
+  pl.listitems = {
+    "1": {
+      "title": "1"
+    },
+    "2": {
+      "title": "2"
+    },
+    "3": {
+      "title": "3"
+    }
+  };
+
+  pattern_assembler.combine_listItems(pl);
+
+  var listPatternPath = path.join('00-test', '685-list.mustache');
+  var listPattern = pattern_assembler.process_pattern_iterative(listPatternPath, pl);
+
+  //act
+  pattern_assembler.process_pattern_recursive(listPatternPath, pl);
+
+  //assert
+  test.true(listPattern.extendedTemplate.indexOf(1) > -1);
+  test.true(listPattern.extendedTemplate.indexOf(2) > -1);
+  test.true(listPattern.extendedTemplate.indexOf(3) > -1);
+  test.end();
+});
+
 tap.test('setState - applies any patternState matching the pattern', function(test) {
   //arrange
   var pa = require('../core/lib/pattern_assembler');
@@ -803,4 +837,4 @@ tap.test('parses pattern extra frontmatter correctly when frontmatter present',
   //assert
   test.equals(testPattern.allMarkdown.joke, 'bad','extra key not added');
   test.end();
-});
+});