Merge pull request #634 from oyyd/fix-asyncif-err

fix #571, make asyncif handle error
mozilla · Jan 14, 2016 · 02a69d5 · 02a69d5
2 parents a90a606 + 89cbe61
commit 02a69d5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/compiler.js b/src/compiler.js
@@ -581,7 +581,7 @@ var Compiler = Object.extend({
  compileIfAsync: function(node, frame) {
  this.emit('(function(cb) {');
  this.compileIf(node, frame, true);
- this.emit('})(function() {');
+ this.emit('})(' + this.makeCallback());
  this.addScopeLevel();
  },
 

diff --git a/tests/compiler.js b/tests/compiler.js
@@ -1209,6 +1209,20 @@
  finish(done);
  });
 
+ it('should throw an error when including a file that calls an undefined macro even inside {% if %} tag', function(done) {
+ render(
+ '{% if true %}{% include "undefined-macro.html" %}{% endif %}',
+ {},
+ { noThrow: true },
+ function(err, res) {
+ expect(res).to.be(undefined);
+ expect(err).to.match(/Unable to call `\w+`, which is undefined or falsey/);
+ }
+ );
+
+ finish(done);
+ });
+
  it('should throw an error when including a file that imports macro that calls an undefined macro', function(done) {
  render(
  '{% include "import-macro-call-undefined-macro.html" %}',