Evaluate truth test bodies inside a @select before resolving the select.

Fixes #134
LinkedInAttic · Apr 27, 2015 · 69d1173 · 69d1173
1 parent fdf8392
commit 69d1173
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/lib/dust-helpers.js b/lib/dust-helpers.js
@@ -128,14 +128,14 @@ function filter(chunk, context, bodies, params, helperName, test) {
   value = coerce(context.resolve(params.value), type);
 
   if (test(key, value)) {
+    if(body) {
+      chunk = chunk.render(body, context);
+    }
     if (selectState) {
       selectState.isResolved = true;
     }
-    if(body) {
-      return chunk.render(body, context);
-    }
   } else if (skip) {
-    return chunk.render(skip, context);
+    chunk = chunk.render(skip, context);
   }
   return chunk;
 }

diff --git a/test/jasmine-test/spec/helpersTests.js b/test/jasmine-test/spec/helpersTests.js
@@ -1061,6 +1061,28 @@
         },
         expected: "done done outside  default default outside",
         message: "should test select helper with params in an outer section"
+      },
+      {
+        name: "select with nested @eq",
+        source: ['{@select key=selectKey}',
+                   '{@eq value=1}One',
+                     '{@eq key=test value=5}Correct!{/eq}',
+                     '{@select}',
+                       '{@eq value=1}Bug! No key specified{:else}Bug! No key specified{/eq}',
+                       '{@eq key=test value=5}InnerCorrect!{/eq}',
+                       '{@eq key=test value=5}Bug! True, but inner select is resolved.{/eq}',
+                     '{/select}',
+                   '{/eq}',
+                   '{@eq value=1}Bug! True, but select is resolved.{:else}Bug! Not false{/eq}',
+                   '{@eq key=key value=2}Bug! True, but select is resolved.{:else}Bug! Not false{/eq}',
+                 '{/select}'].join(''),
+        context: {
+          selectKey: 1,
+          test: 5,
+          key: 2
+        },
+        expected: "OneCorrect!InnerCorrect!",
+        message: "Truth tests should only be skipped at the top level of a select"
       }
     ]
   },