Added deep-extend test case to express server.

shannonmoeller · shannonmoeller · commit c47dc451166a · 2015-01-03T21:20:00.000-05:00
diff --git a/dist/handlebars-layouts.js b/dist/handlebars-layouts.js
@@ -114,7 +114,7 @@ function layouts(handlebars) {
 		 * @param {String} name
 		 * @param {Object} options
 		 * @param {Function(Object)} options.fn
-		 * @return {String} Block content.
+		 * @return {String} Modified block content.
 		 */
 		block: function (name, options) {
 			options = options || {};
@@ -169,7 +169,6 @@ function layouts(handlebars) {
  */
 layouts.register = layouts;
 
-// Legacy
 module.exports = layouts;
 
 },{}]},{},[1])(1)
diff --git a/index.js b/index.js
@@ -113,7 +113,7 @@ function layouts(handlebars) {
 		 * @param {String} name
 		 * @param {Object} options
 		 * @param {Function(Object)} options.fn
-		 * @return {String} Block content.
+		 * @return {String} Modified block content.
 		 */
 		block: function (name, options) {
 			options = options || {};
@@ -168,5 +168,4 @@ function layouts(handlebars) {
  */
 layouts.register = layouts;
 
-// Legacy
 module.exports = layouts;
diff --git a/test/expected/deep-extend.html b/test/expected/deep-extend.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<html lang="en-us">
+<head>
+		<title>Users</title>
+
+		<link rel="stylesheet" href="assets/css/screen.css" />
+</head>
+<body>
+	<div class="site">
+		<div class="site-hd" role="banner">
+				<h1>Users</h1>
+				<h2>Goodnight Moon</h2>
+
+		</div>
+
+		<div class="site-bd" role="main">
+		<div class="grid">
+			<div class="col 2of3">
+		<p>Dolor sit amet.</p>
+					<p>Lorem ipsum.</p>
+			</div>
+
+			<div class="col 1of3">
+		<p>Consectetur adipiscing elit.</p>
+			</div>
+		</div>
+		</div>
+
+		<div class="site-ft" role="contentinfo">
+				<small>&copy; 1984</small>
+		<p>MIT License</p>
+		</div>
+	</div>
+
+		<script src="assets/js/controllers/home.js"></script>
+</body>
+</html>
diff --git a/test/express.js b/test/express.js
@@ -17,15 +17,17 @@ utils.registerPartials(partials);
 // Server
 express()
 	// Settings
-	.set('view engine', 'hbs')
 	.set('views', views)
+	.set('view engine', 'html')
+	.engine('html', require('hbs').__express)
 
 	// Routes
-	.get('/append',  function (req, res) { res.render('append',  data); })
-	.get('/embed',   function (req, res) { res.render('embed',   data); })
-	.get('/extend',  function (req, res) { res.render('extend',  data); })
-	.get('/prepend', function (req, res) { res.render('prepend', data); })
-	.get('/replace', function (req, res) { res.render('replace', data); })
+	.get('/append',       function (req, res) { res.render('append',      data); })
+	.get('/bogus',        function (req, res) { res.render('bogus',       data); })
+	.get('/deep-extend',  function (req, res) { res.render('deep-extend', data); })
+	.get('/embed',        function (req, res) { res.render('embed',       data); })
+	.get('/prepend',      function (req, res) { res.render('prepend',     data); })
+	.get('/replace',      function (req, res) { res.render('replace',     data); })
 
 	// Start
 	.listen(3000);
diff --git a/test/fixtures/deep-extend.html b/test/fixtures/deep-extend.html
@@ -0,0 +1,17 @@
+{{#extend "layout2col"}}
+	{{#content "subtitle" mode="append"}}
+		<h2>Goodnight Moon</h2>
+	{{/content}}
+
+	{{#content "left" mode="prepend"}}
+		<p>Dolor sit amet.</p>
+	{{/content}}
+
+	{{#content "right"}}
+		<p>Consectetur adipiscing elit.</p>
+	{{/content}}
+
+	{{#content "footer" mode="append"}}
+		<p>MIT License</p>
+	{{/content}}
+{{/extend}}
