fix(unit tests): Fix more tests. Since we no longer render, no need to look for escaped values

Author: bmuenzenmeyer

core/lib/replaceParameter.js

@@ -12,19 +12,27 @@ module.exports = function (template, prop, data) {
   if (typeof data === 'boolean') {
     const startRE = new RegExp(`{{\\s?#[${prop}]+\\s?}}`);
     const endRE = new RegExp(`{{\\s?/[${prop}]+\\s?}}`);
+
+    const bIdx = t.search(startRE);
+    const eIdxStart = t.search(endRE);
+
+    // try to determine if this is a {{#section}}
+    // if it is, this looks like a boolean value meant to be a mere {{value}}
+    if (bIdx === -1) {
+      return t.replace(`{{${prop}}}`, data);
+    }
+
     if (data) {
       t = t.replace(startRE, '');
       t = t.replace(endRE, '');
     } else {
-      const bIdx = t.search(startRE);
-      const eIdxStart = t.search(endRE);
+      // data is falsey
       const eIdxEnd = t.indexOf('}}', eIdxStart) + 2;
       t = t.substring(0, bIdx) + t.substring(eIdxEnd, t.length);
     }
     return t;
   }
 
-  console.log(`Could not replace ${prop} with ${data} inside ${template}`);
   logger.warning(`Could not replace ${prop} with ${data} inside ${template}`);
   return t;
 };

test/files/_patterns/00-test/comment-tag.mustache

@@ -0,0 +1 @@
+<p>{{{ tag1 }}}</p><p>{{{ tag2 }}}</p><p>{{{ tag3 }}}</p>

test/files/_patterns/00-test/linkInParameter.mustache

@@ -0,0 +1 @@
+{{> test-link(url: 'link.test-comment') }}

test/files/_patterns/00-test/parameterTags.mustache

@@ -0,0 +1 @@
+{{> test-comment-tag(tag1: '<strong>Single-quoted</strong>', tag2: \"<em>Double-quoted</em>\", tag3: '<strong class=\\\"foo\\\" id=\\\'bar\\\'>With attributes</strong>') }}

test/index_tests.js

@@ -45,7 +45,7 @@ tap.test('getDefaultConfig - should return the default config object', function
   test.end();
 });
 
-tap.test('buildPatterns', function () {
+tap.only('buildPatterns', function () {
   //arrange
 
   var patternExporterMock = {
@@ -63,7 +63,7 @@ tap.test('buildPatterns', function () {
         test.end();
       });
 
-      tap.test('parameter hunter finds partials with their own parameters and renders them too', function (test) {
+      tap.test('finds partials with their own parameters and renders them too', function (test) {
         var pattern = get('test-c', patternlab);
         test.equals(util.sanitized(pattern.extendedTemplate), util.sanitized(`<b>c</b>
         <b>b</b>
@@ -73,11 +73,24 @@ tap.test('buildPatterns', function () {
         test.end();
       });
 
-      tap.test('parameter hunter finds and extends templates with mixed parameter and global data', function (test) {
+      tap.test('finds and extends templates with mixed parameter and global data', function (test) {
         var pattern = get('test-sticky-comment', patternlab);
         test.equals(util.sanitized(pattern.patternPartialCode), util.sanitized(`<h1>Bar</h1><p>A life is like a garden. Perfect moments can be had, but not preserved, except in memory.</p>`));
         test.end();
       });
+
+      tap.test('expands links inside parameters', function (test) {
+        var pattern = get('test-linkInParameter', patternlab);
+        test.equals(util.sanitized(pattern.patternPartialCode), util.sanitized(`<a href="/patterns/00-test-comment/00-test-comment.rendered.html">Cool Dude</a>`));
+        test.end();
+      });
+
+      // From issue #145 https://github.com/pattern-lab/patternlab-node/issues/145
+      tap.test(' parses parameters containing html tags', function (test) {
+        var pattern = get('test-parameterTags', patternlab);
+        test.equals(util.sanitized(pattern.patternPartialCode), util.sanitized(`<p><strong>Single-quoted</strong></p><p><em>Double-quoted</em></p><p><strong class="foo" id=\'bar\'>With attributes</strong></p>`));
+        test.end();
+      });
     }
   };
 

test/parameter_hunter_tests.js

@@ -86,7 +86,7 @@ tap.test('parameter hunter parses parameters with unquoted keys and unquoted val
     //act
     parameter_hunter.find_parameters(testPattern, pl).then(() => {
       //assert
-      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1></h1><p>true</p>'));
+      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1>{{foo}}</h1><p>true</p>'));
       test.end();
     });
   });
@@ -173,7 +173,7 @@ tap.test('parameter hunter parses parameters with single-quoted keys and single-
     //act
     parameter_hunter.find_parameters(testPattern, pl).then(() => {
       //assert
-      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1>{{foo}}</h1><p>true not,&#39;true&#39;</p>'));
+      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized(`<h1>{{foo}}</h1><p>true not,'true'</p>`));
       test.end();
     });
   });
@@ -201,7 +201,7 @@ tap.test('parameter hunter parses parameters with single-quoted keys and double-
     //act
     parameter_hunter.find_parameters(testPattern, pl).then(() => {
       //assert
-      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1>{{foo}}</h1><p>true not:&#39;true&#39;</p>'));
+      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized(`<h1>{{foo}}</h1><p>true not:'true'</p>`));
       test.end();
     });
   });
@@ -257,7 +257,7 @@ tap.test('parameter hunter parses parameters with double-quoted keys and single-
     //act
     parameter_hunter.find_parameters(testPattern, pl).then(() => {
       //assert
-      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1>{{foo}}</h1><p>true not{&quot;true&quot;</p>'));
+      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1>{{foo}}</h1><p>true not{"true"</p>'));
       test.end();
     });
   });
@@ -286,7 +286,7 @@ tap.test('parameter hunter parses parameters with double-quoted keys and double-
     //act
     parameter_hunter.find_parameters(testPattern, pl).then(() => {
       //assert
-      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1>{{foo}}</h1><p>true not}&quot;true&quot;</p>'));
+      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<h1>{{foo}}</h1><p>true not}"true"</p>'));
       test.end();
     });
   });
@@ -378,67 +378,3 @@ tap.test('parameter hunter skips malformed parameters', function (test) {
     });
   });
 });
-
-// From issue #145 https://github.com/pattern-lab/patternlab-node/issues/145
-tap.only('parameter hunter parses parameters containing html tags', function (test){
-
-  const pl = util.fakePatternLab(testPatternsPath);
-
-  var commentPath = path.join('00-test', 'comment.mustache');
-  var commentPattern = loadPattern(commentPath, pl);
-
-  var testPatternPath = path.join('00-test', 'sticky-comment.mustache');
-  var testPattern = loadPattern(testPatternPath, pl);
-
-  //override the commentTemplate - i dont really want to create another file
-  pl.patterns[0].template = "<p>{{{ tag1 }}}</p><p>{{{ tag2 }}}</p><p>{{{ tag3 }}}</p>";
-  pl.patterns[0].extendedTemplate = pl.patterns[0].template;
-
-  //override the file
-  testPattern.template = "{{> test-comment(tag1: '<strong>Single-quoted</strong>', tag2: \"<em>Double-quoted</em>\", tag3: '<strong class=\\\"foo\\\" id=\\\'bar\\\'>With attributes</strong>') }}";
-  testPattern.extendedTemplate = testPattern.template;
-  testPattern.parameteredPartials[0] = testPattern.template;
-
-  var p1 = processIterative(commentPattern, pl);
-  var p2 = processIterative(testPattern, pl);
-
-  Promise.all([p1, p2]).then(() => {
-    //act
-    parameter_hunter.find_parameters(testPattern, pl).then(() => {
-      //assert
-      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<p><strong>Single-quoted</strong></p><p><em>Double-quoted</em></p><p><strong class="foo" id=\'bar\'>With attributes</strong></p>'));
-      test.end();
-    });
-  });
-});
-
-tap.only('parameter hunter expands links inside parameters', function (test) {
-  const pl = util.fakePatternLab(testPatternsPath);
-
-  var commentPath = path.join('00-test', 'comment.mustache');
-  var commentPattern = loadPattern(commentPath, pl);
-
-  var testPatternPath = path.join('00-test', 'sticky-comment.mustache');
-  var testPattern = loadPattern(testPatternPath, pl);
-
-  //override the commentTemplate - i dont really want to create another file
-  pl.patterns[0].template = '<a href="{{{ url }}}">{{ description }}</a>';
-  pl.patterns[0].extendedTemplate = pl.patterns[0].template;
-
-  //override the file
-  testPattern.template = "{{> test-comment(url: 'link.test-comment', description: 'Link to single comment') }}";
-  testPattern.extendedTemplate = testPattern.template;
-  testPattern.parameteredPartials[0] = testPattern.template;
-
-  var p1 = processIterative(commentPattern, pl);
-  var p2 = processIterative(testPattern, pl);
-
-  Promise.all([p1, p2]).then(() => {
-    //act
-    parameter_hunter.find_parameters(testPattern, pl).then(() => {
-      //assert
-      test.equals(util.sanitized(testPattern.extendedTemplate), util.sanitized('<a href="/patterns/00-test-comment/00-test-comment.rendered.html">Link to single comment</a>'));
-      test.end();
-    });
-  });
-});

test/replaceParameter_tests.js

@@ -12,19 +12,31 @@ tap.test('replaces simple value', function (test) {
   test.end();
 });
 
-tap.test('replaces boolean true', function (test) {
+tap.test('replaces simple boolean true value', function (test) {
+  const result = replaceParameter('{{key}}', 'key', true);
+  test.equals(result, 'true');
+  test.end();
+});
+
+tap.test('replaces simple boolean false value', function (test) {
+  const result = replaceParameter('{{key}}', 'key', false);
+  test.equals(result, 'false');
+  test.end();
+});
+
+tap.test('replaces boolean true section', function (test) {
   const result = replaceParameter('1{{#key}}value{{/key}}2', 'key', true);
   test.equals(result, '1value2');
   test.end();
 });
 
-tap.only('replaces boolean true with spaces', function (test) {
+tap.only('replaces boolean true section with spaces', function (test) {
   const result = replaceParameter('1{{ #key }}value{{ /key }}2', 'key', true);
   test.equals(result, '1value2');
   test.end();
 });
 
-tap.test('replaces boolean false', function (test) {
+tap.test('replaces boolean section false', function (test) {
   const result = replaceParameter('1{{#key}}value{{/key}}2', 'key', false);
   test.equals(result, '12');
   test.end();