Merge pull request #152 from EriksRemess/patch-1

Joining block contents with newline

Author: jtwebman

lib/hbs.js

@@ -237,6 +237,9 @@ ExpressHbs.prototype.express3 = function(options) {
     if (val === undefined && typeof options.fn === 'function') {
       val = options.fn(this);
     }
+    if (Array.isArray(val)) {
+      val = val.join('\n'); 
+    }
     return val;
   });
 

test/issues.js

@@ -429,3 +429,20 @@ describe('issue-144', function() {
     });
   });
 });
+
+describe('issue-153', function() {
+  var dirname = path.join(__dirname, 'issues/153');
+  it('should concat contentFor blocks with newline', function(done) {
+    var check = function (err, html) {
+      if (err) {
+        done(err);
+      }
+      assert.equal('1\n2', html.trim());
+      done();
+    }
+    var hb = hbs.create()
+    var render = hb.express3({});
+    var locals = H.createLocals('express3', dirname, { });
+    render(dirname + '/index.hbs', locals, check);
+  });
+});

test/issues/153/index.hbs

@@ -0,0 +1,3 @@
+{{#contentFor "testBlock"}}1{{/contentFor}}
+{{#contentFor "testBlock"}}2{{/contentFor}}
+{{{block "testBlock"}}}