fix unit tests exposed by #543

closes #543

Author: bmuenzenmeyer

core/lib/pattern_assembler.js

@@ -45,7 +45,7 @@ var pattern_assembler = function () {
         return patternlab.patterns[i];
       }
     }
-    plutils.logOrange('Could not find pattern referenced with partial synxtax "' + partialName + '". This can occur when a pattern was renamed, moved, or no longer exists but it still called within a different template somewhere.');
+    plutils.logOrange('Could not find pattern referenced with partial syntax ' + partialName + '. This can occur when a pattern was renamed, moved, or no longer exists but it still called within a different template somewhere.');
     return undefined;
   }
 
@@ -440,8 +440,8 @@ var pattern_assembler = function () {
   function parseDataLinksHelper(patternlab, obj, key) {
     var linkRE, dataObjAsString, linkMatches;
 
-    //check for link.patternPartial
-    linkRE = /link\.[A-z0-9-_]+(?!.)/g;
+    //check for 'link.patternPartial'
+    linkRE = /(?:'|")(link\.[A-z0-9-_]+)(?:'|")/g;
 
     //stringify the passed in object
     dataObjAsString = JSON5.stringify(obj);
@@ -456,7 +456,7 @@ var pattern_assembler = function () {
         if (dataLink && dataLink.split('.').length >= 2) {
 
           //get the partial the link refers to
-          var linkPatternPartial = dataLink.split('.')[1];
+          var linkPatternPartial = dataLink.split('.')[1].replace('"', '').replace("'", "");
           var pattern = getPartial(linkPatternPartial, patternlab);
           if (pattern !== undefined) {
 
@@ -470,7 +470,7 @@ var pattern_assembler = function () {
 
               //also make sure our global replace didn't mess up a protocol
               fullLink = fullLink.replace(/:\//g, '://');
-              dataObjAsString = dataObjAsString.replace(dataLink, fullLink);
+              dataObjAsString = dataObjAsString.replace('link.' + linkPatternPartial, fullLink);
             }
           } else {
             if (patternlab.config.debug) {

test/pattern_assembler_tests.js

@@ -546,21 +546,21 @@ tap.test('parseDataLinks - replaces found link.* data for their expanded links',
   }
 
   //assert before
-  test.equals(pattern.jsonFileData.brad.url, "link.twitter-brad");
-  test.equals(pattern.jsonFileData.dave.url, "link.twitter-dave");
-  test.equals(pattern.jsonFileData.brian.url, "link.twitter-brian");
+  test.equals(pattern.jsonFileData.brad.url, "link.twitter-brad", "brad pattern data should be found");
+  test.equals(pattern.jsonFileData.dave.url, "link.twitter-dave", "dave pattern data should be found");
+  test.equals(pattern.jsonFileData.brian.url, "link.twitter-brian", "brian pattern data should be found");
 
   //act
   pattern_assembler.parse_data_links(patternlab);
 
   //assert after
-  test.equals(pattern.jsonFileData.brad.url, "https://twitter.com/brad_frost");
-  test.equals(pattern.jsonFileData.dave.url, "https://twitter.com/dmolsen");
-  test.equals(pattern.jsonFileData.brian.url, "https://twitter.com/bmuenzenmeyer");
+  test.equals(pattern.jsonFileData.brad.url, "https://twitter.com/brad_frost", "brad pattern data should be replaced");
+  test.equals(pattern.jsonFileData.dave.url, "https://twitter.com/dmolsen",  "dave pattern data should be replaced");
+  test.equals(pattern.jsonFileData.brian.url, "https://twitter.com/bmuenzenmeyer", "brian pattern data should be replaced");
 
-  test.equals(patternlab.data.brad.url, "https://twitter.com/brad_frost");
-  test.equals(patternlab.data.dave.url, "https://twitter.com/dmolsen");
-  test.equals(patternlab.data.brian.url, "https://twitter.com/bmuenzenmeyer");
+  test.equals(patternlab.data.brad.url, "https://twitter.com/brad_frost", "global brad data should be replaced");
+  test.equals(patternlab.data.dave.url, "https://twitter.com/dmolsen", "global dave data should be replaced");
+  test.equals(patternlab.data.brian.url, "https://twitter.com/bmuenzenmeyer", "global brian data should be replaced");
   test.end();
 });