Merge pull request #131 from sethkinast/undefined-head

Explicitly check context.stack.tail.head to make sure it is defined
LinkedInAttic · Apr 13, 2015 · 1f481f4 · 1f481f4
2 parents beaf4f3 + 0ded5b3
commit 1f481f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/dust-helpers.js b/lib/dust-helpers.js
@@ -25,6 +25,7 @@ function _deprecated(target) {
 
 function isSelect(context) {
   return context.stack.tail &&
+         context.stack.tail.head &&
          typeof context.stack.tail.head.__select__ !== "undefined";
 }
 

diff --git a/test/jasmine-test/spec/helpersTests.js b/test/jasmine-test/spec/helpersTests.js
@@ -517,6 +517,13 @@
         context:  {},
         expected: "",
         message: "eq helper without a body should fail gracefully and return nothing"
+      },
+      {
+        name:     "eq helper with makeBase",
+        source:   '{@eq key=hello value="world"}Hello{/eq}',
+        context:  dust.makeBase({ hello:"world" }).push({ foo: "bar" }),
+        expected: "Hello",
+        message:  "eq helper can draw from globals even when the stack is undefined"
       }
     ]
   },