add tests for custom tag and delimiter options

Author: Jeff Escalante

lib/index.js

@@ -60,7 +60,7 @@ function walk (opts, nodes) {
     }
 
     // if the node has content, recurse (unless it's a loop, handled later)
-    if (node.content && node.tag !== 'each') {
+    if (node.content && node.tag !== loops[0]) {
       node.content = walk(opts, node.content)
     }
 

test/fixtures/conditional_customtags.expected.html

@@ -0,0 +1,4 @@
+<p>x</p>
+
+  <p>it works!</p>
+<p>x</p>

test/fixtures/conditional_customtags.html

@@ -0,0 +1,14 @@
+<p>x</p>
+<zif condition="foo === 'bar'">
+  <p>it works!</p>
+</zif>
+<zelseif condition="foo === 'wow'">
+  <p>it doesn't work</p>
+</zelseif>
+<zelseif condition="foo === 'snargle'">
+  <p>it really doesn't work</p>
+</zelseif>
+<zelse>
+  <p>it definitely doesn't work</p>
+</zelse>
+<p>x</p>

test/fixtures/custom_delimiters.expected.html

@@ -0,0 +1,3 @@
+x wow x 2 x
+<p class="x wow x">x wow x</p>
+x&x

test/fixtures/custom_delimiters.html

@@ -0,0 +1,3 @@
+x {% test %} x {% 1 + 1 %} x
+<p class="x {% test %} x">x {% test %} x</p>
+{{% 'x&x' %}}

test/fixtures/loop_customtag.expected.html

@@ -0,0 +1,9 @@
+<p>x</p>
+
+  <p>0: 1</p>
+
+  <p>1: 2</p>
+
+  <p>2: 3</p>
+
+<p>x</p>

test/fixtures/loop_customtag.html

@@ -0,0 +1,5 @@
+<p>x</p>
+<zeach loop='item, index in items'>
+  <p>{{index}}: {{item}}</p>
+</zeach>
+<p>x</p>

test/index.js

@@ -19,6 +19,14 @@ test('unescaped', (t) => {
   })
 })
 
+test('custom delimiters', (t) => {
+  return matchExpected(t, 'custom_delimiters', {
+    delimiters: ['{%', '%}'],
+    unescapeDelimiters: ['{{%', '%}}'],
+    locals: { test: 'wow' }
+  })
+})
+
 test('expression spacing', (t) => {
   return matchExpected(t, 'expression_spacing', { locals: { foo: 'X' } })
 })
@@ -67,6 +75,13 @@ test('conditional - expression error', (t) => {
   })
 })
 
+test('conditional - custom tags', (t) => {
+  return matchExpected(t, 'conditional_customtags', {
+    conditionalTags: ['zif', 'zelseif', 'zelse'],
+    locals: { foo: 'bar' }
+  })
+})
+
 test('loop', (t) => {
   return matchExpected(t, 'loop', { locals: { items: [1, 2, 3] } })
 })
@@ -95,6 +110,13 @@ test('nested loops', (t) => {
   })
 })
 
+test('loop - custom tag', (t) => {
+  return matchExpected(t, 'loop_customtag', {
+    loopTags: ['zeach'],
+    locals: { items: [1, 2, 3] }
+  })
+})
+
 test('loop - no loop attribute', (t) => {
   return expectError('loop_no_attr', (err) => {
     t.truthy(err.toString() === 'Error: the "elseif" tag must have a "loop" attribute')