fix include "open" / "close" options. Closes tj#64

xysDavid · Aug 16, 2012 · 306bbda · 306bbda
1 parent 6a369fe
commit 306bbda
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/ejs.js b/lib/ejs.js
@@ -156,7 +156,7 @@ var parse = exports.parse = function(str, options){
         if (!filename) throw new Error('filename option is required for includes');
         var path = resolveInclude(name, filename);
         include = read(path, 'utf8');
-        include = exports.parse(include, { filename: path, _with: false });
+        include = exports.parse(include, { filename: path, _with: false, open: open, close: close });
         buf.push("' + (function(){" + include + "})() + '");
         js = '';
       }

diff --git a/test/ejs.js b/test/ejs.js
@@ -169,7 +169,7 @@ describe('exceptions', function(){
 describe('includes', function(){
   it('should include ejs', function(){
     var file = 'test/fixtures/include.ejs';
-    ejs.render(fixture('include.ejs'), { filename: file, pets: users })
+    ejs.render(fixture('include.ejs'), { filename: file, pets: users, open: '[[', close: ']]' })
       .should.equal(fixture('include.html'));
   })
 

diff --git a/test/fixtures/include.ejs b/test/fixtures/include.ejs
@@ -1,5 +1,5 @@
 <ul>
-  <% pets.forEach(function(pet){ %>
-    <% include pet %>
-  <% }) %>
+  [[ pets.forEach(function(pet){ ]]
+    [[ include pet ]]
+  [[ }) ]]
 </ul>
diff --git a/test/fixtures/pet.ejs b/test/fixtures/pet.ejs
@@ -1 +1 @@
-<li><%= pet.name %></li>
+<li>[[= pet.name ]]</li>