Merge branch 'tvavrys-master'. Closes gh-407

paularmstrong · Jan 28, 2014 · 0ae0987 · 0ae0987
2 parents 8cd0f2f + 50358d7
commit 0ae0987
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/tags/include.js b/lib/tags/include.js
@@ -32,7 +32,7 @@ exports.compile = function (compiler, args) {
   var file = args.shift(),
     onlyIdx = args.indexOf(only),
     onlyCtx = onlyIdx !== -1 ? args.splice(onlyIdx, 1) : false,
-    parentFile = args.pop().replace(/\\/g, '\\\\'),
+    parentFile = (args.pop() || '').replace(/\\/g, '\\\\'),
     ignore = args[args.length - 1] === missing ? (args.pop()) : false,
     w = args.join('');
 

diff --git a/tests/tags/include.test.js b/tests/tags/include.test.js
@@ -2,6 +2,11 @@ var swig = require('../../lib/swig'),
   expect = require('expect.js');
 
 describe('Tag: include', function () {
+  it('Works with non-relative loader setups', function () {
+    var s = new swig.Swig({ loader: swig.loaders.memory({ '/foo/foobar': 'tacos!' }, '/foo')});
+    expect(s.render('{% include "foobar" %}')).to.equal('tacos!');
+  });
+
   describe('{% include "foo" ignore missing %}', function () {
     it('does not throw if missing', function () {
       expect(swig.render('{% include "foo" ignore missing %}', { filename: '/foo' }))