Merge pull request hapijs#942 from wpreul/master

Layouts work correctly in jade

docs/Reference.md

@@ -249,8 +249,8 @@ When creating a server instance, the following options configure the server's be
       not supported and are ignored. Defaults to no helpers support (empty path).
     - `basePath` - a base path used as prefix for `path` and `partialsPath`. No default.
     - `layout` - if set to `true`, layout support is enabled. A layout is a single template file used as the parent template for other view templates
-      in the same engine. The layout template name must be 'layout.ext' where 'ext' is the engine's extension.
-      Defaults to `false`.
+      in the same engine. The layout template name must be 'layout.ext' where 'ext' is the engine's extension.  Disable 'layout' when using Jade as
+      it will handle including any layout files independently of Hapi.  Defaults to `false`.
     - `layoutKeyword` - the key used by the template engine to denote where primary template content should go. Defaults to `'content'`.
     - `encoding` - the text encoding used by the templates when reading the files and outputting the result. Defaults to `'utf-8'`.
     - `isCached` - if set to `false`, templates will not be cached (thus will be read from file on every use). Defaults to `true`.

test/unit/templates/valid/index.jade

@@ -0,0 +1,4 @@
+extends layout
+
+block content
+    p= message

test/unit/templates/valid/layout.jade

@@ -1,3 +1,4 @@
 html
     body
-    block content
+    block content
+        =content

test/unit/templates/valid/test.jade

@@ -0,0 +1 @@
+p= message

test/unit/views.js

@@ -37,6 +37,18 @@ describe('Views', function () {
             layout: true
         });
 
+        var testViewWithJadeLayouts = new Views({
+            engines: { 'jade': 'jade' },
+            path: viewsPath + '/valid/',
+            layout: true
+        });
+
+        var testViewWithoutJadeLayouts = new Views({
+            engines: { 'jade': 'jade' },
+            path: viewsPath + '/valid/',
+            layout: false
+        });
+
         it('renders with async compile', function (done) {
 
             var views = new Views({
@@ -57,7 +69,7 @@ describe('Views', function () {
             views.render('valid/test', { title: 'test', message: 'Hapi' }, null, function (err, rendered, config) {
 
                 expect(rendered).to.exist;
-                expect(rendered.length).above(1);
+                expect(rendered).to.contain('Hapi');
                 done();
             });
         });
@@ -92,7 +104,7 @@ describe('Views', function () {
             testView.render('valid/test', { title: 'test', message: 'Hapi' }, null, function (err, rendered, config) {
 
                 expect(rendered).to.exist;
-                expect(rendered.length).above(1);
+                expect(rendered).to.contain('Hapi');
                 done();
             });
         });
@@ -102,10 +114,27 @@ describe('Views', function () {
             testViewWithLayouts.render('valid/test', { title: 'test', message: 'Hapi' }, null, function (err, rendered, config) {
 
                 expect(rendered).to.exist;
-                expect(rendered.length).above(1);
+                expect(rendered).to.contain('Hapi');
                 done();
             });
+        });
+
+        it('should work and not throw with valid jade layouts', function (done) {
 
+            testViewWithJadeLayouts.render('index', { title: 'test', message: 'Hapi' }, null, function (err, rendered, config) {
+
+                expect(rendered).to.contain('Hapi');
+                done();
+            });
+        });
+
+        it('should work and not throw without jade layouts', function (done) {
+
+            testViewWithoutJadeLayouts.render('test', { title: 'test', message: 'Hapi Message' }, null, function (err, rendered, config) {
+
+                expect(rendered).to.contain('Hapi Message');
+                done();
+            });
         });
 
         it('should work and not throw with basePath, template name, and no path', function (done) {
@@ -114,7 +143,7 @@ describe('Views', function () {
             views.render('test', { title: 'test', message: 'Hapi' }, { basePath: viewsPath + '/valid' }, function (err, rendered, config) {
 
                 expect(rendered).to.exist;
-                expect(rendered.length).above(1);
+                expect(rendered).to.contain('Hapi');
                 done();
             });
         });