more conditional tests

Author: Jeff Escalante

lib/index.js

@@ -110,13 +110,13 @@ function walk (opts, nodes) {
       }, '')
 
       // evaluate the expression, get the winning node
-      const expResult = ast[vm.runInContext(expression, ctx)].content
+      const expResult = ast[vm.runInContext(expression, ctx)]
 
       // remove all of the conditional tags from the tree
       // we subtract 1 from i as it's incremented from the initial if statement
       // in order to get the next node
       skip = current - i
-      m.push(...expResult)
+      if (expResult) m.push(...expResult.content)
       return m
       // nodes.splice(i - 1, current - i, ...expResult)
     }

test/fixtures/conditional_nested.expected.html

@@ -0,0 +1,7 @@
+<p>x</p>
+
+  <p>y</p>
+  
+    <p>z</p>
+  <p>y</p>
+<p>x</p>

test/fixtures/conditional_nested.html

@@ -0,0 +1,9 @@
+<p>x</p>
+<if condition='true'>
+  <p>y</p>
+  <if condition='true'>
+    <p>z</p>
+  </if>
+  <p>y</p>
+</if>
+<p>x</p>

test/fixtures/conditional_norender.expected.html

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

test/fixtures/conditional_norender.html

@@ -0,0 +1,5 @@
+<p>x</p>
+<if condition='false'>
+  <p>hi</p>
+</if>
+<p>x</p>

test/fixtures/conditional_tag_break.expected.html

@@ -0,0 +1,5 @@
+  <p>if</p>
+<p>x</p>
+<else>
+  <p>else</p>
+</else>

test/fixtures/conditional_tag_break.html

@@ -0,0 +1,7 @@
+<if condition='true'>
+  <p>if</p>
+</if>
+<p>x</p>
+<else>
+  <p>else</p>
+</else>

test/index.js

@@ -33,6 +33,10 @@ test('conditional - only "if" condition', (t) => {
   return matchExpected(t, 'conditional_if', { locals: { foo: 'bar' } })
 })
 
+test('conditional - no render', (t) => {
+  return matchExpected(t, 'conditional_norender', {})
+})
+
 test('conditional - "if" tag missing condition', (t) => {
   return expectError('conditional_if_error', (err) => {
     t.truthy(err.toString() === 'Error: the "if" tag must have a "condition" attribute')
@@ -45,8 +49,14 @@ test('conditional - "elseif" tag missing condition', (t) => {
   })
 })
 
-test.todo('conditional - other tag in middle of statement')
-test.todo('conditional - nested conditionals')
+test('conditional - other tag in middle of statement', (t) => {
+  return matchExpected(t, 'conditional_tag_break', {})
+})
+
+test('conditional - nested conditionals', (t) => {
+  return matchExpected(t, 'conditional_nested', {})
+})
+
 test.todo('conditional - expression error')
 
 //