From 631cedc8f2acb35d9024b04ea70456fbeadfe3d0 Mon Sep 17 00:00:00 2001 From: Carlos Correa Date: Thu, 10 Jul 2014 17:10:41 -0700 Subject: [PATCH 1/2] tests for jade includes. --- test/engines_test.js | 10 ++++++++++ test/fixtures/jst_engine/jade/included.jst.jade | 1 + test/fixtures/jst_engine/jade/template.jst.jade | 3 +++ 3 files changed, 14 insertions(+) create mode 100644 test/fixtures/jst_engine/jade/included.jst.jade create mode 100644 test/fixtures/jst_engine/jade/template.jst.jade diff --git a/test/engines_test.js b/test/engines_test.js index 204371f2..2222cbc3 100644 --- a/test/engines_test.js +++ b/test/engines_test.js @@ -49,6 +49,16 @@ describe('Engines', function () { assert(asset.toString().match(/buf\.push/)); }); }); + + describe('JADE', function () { + it('should compile to a JS function', function () { + var asset = env.findAsset('jst_engine/jade/template'); + assert(asset.toString().match(/this\.JST/)); + assert(asset.toString().match(/buf\.push/)); + assert(asset.toString().match(/template/)); + assert(asset.toString().match(/included/)); + }); + }); }); }); diff --git a/test/fixtures/jst_engine/jade/included.jst.jade b/test/fixtures/jst_engine/jade/included.jst.jade new file mode 100644 index 00000000..b64db037 --- /dev/null +++ b/test/fixtures/jst_engine/jade/included.jst.jade @@ -0,0 +1 @@ +| included \ No newline at end of file diff --git a/test/fixtures/jst_engine/jade/template.jst.jade b/test/fixtures/jst_engine/jade/template.jst.jade new file mode 100644 index 00000000..5e2ecaed --- /dev/null +++ b/test/fixtures/jst_engine/jade/template.jst.jade @@ -0,0 +1,3 @@ +div + | template + include ./included.jst.jade \ No newline at end of file From a6d1d3bce9b961ed0fcb5c1121a41cee8f7020d6 Mon Sep 17 00:00:00 2001 From: Carlos Correa Date: Thu, 10 Jul 2014 17:36:30 -0700 Subject: [PATCH 2/2] bug: jade filename should be set to pathname, not logicalpath. --- lib/mincer/engines/jade_engine.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mincer/engines/jade_engine.js b/lib/mincer/engines/jade_engine.js index b75b5616..356738a1 100644 --- a/lib/mincer/engines/jade_engine.js +++ b/lib/mincer/engines/jade_engine.js @@ -80,7 +80,7 @@ JadeEngine.prototype.evaluate = function (context, locals) { this.data = compile(this.data, _.extend({}, options, { client: true, // needed only for Jade < v1.0.0 - filename: context.logicalpath + filename: context.pathname })).toString(); return; }