Fixed include regression. Closes #354

pugjs · Sep 30, 2011 · c03d8b0 · c03d8b0 · danmactough · Sep 30, 2011
1 parent 733dcaf
commit c03d8b0
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 1 deletion.
diff --git a/lib/nodes/literal.js b/lib/nodes/literal.js
@@ -19,7 +19,9 @@ var Node = require('./node');
  */
 
 var Literal = module.exports = function Literal(str) {
-  this.str = str;
+  this.str = str
+    .replace(/\n/g, "\\n")
+    .replace(/'/g, "\\'");
 };
 
 /**

diff --git a/test/fixtures/scripts.jade b/test/fixtures/scripts.jade
@@ -0,0 +1,2 @@
+script(src='/jquery.js')
+script(src='/caustic.js')
diff --git a/test/fixtures/test.css b/test/fixtures/test.css
@@ -0,0 +1,3 @@
+body {
+  color: black;
+}
diff --git a/test/jade.test.js b/test/jade.test.js
@@ -888,6 +888,29 @@ module.exports = {
     assert.equal('<p>awesome tobi</p><p>lame jane</p><p>loki</p>', render(str));
   },
 
+  'test include': function(assert){
+    var str = [
+        'html',
+        '  head',
+        '    include fixtures/test.css',
+    ].join('\n');
+
+    assert.equal('<html><head>body {\n  color: black;\n}</head></html>'
+      , render(str, { filename: __dirname + '/jade.test.js' }));
+  },
+
+  'test include block': function(assert){
+    var str = [
+        'html',
+        '  head',
+        '    include fixtures/scripts',
+        '      scripts(src="/app.js")',
+    ].join('\n');
+
+    assert.equal('<html><head><script src=\"/jquery.js\"></script><script src=\"/caustic.js\"></script><scripts src=\"/app.js\"></scripts></head></html>'
+      , render(str, { filename: __dirname + '/jade.test.js' }));
+  },
+
   'test .render(str, fn)': function(assert){
     jade.render('p foo bar', function(err, str){
       assert.ok(!err);