Added haml test

expressjs · Jul 7, 2010 · dc5caeb · dc5caeb
1 parent 14280df
commit dc5caeb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "support/jade"]
 	path = support/jade
 	url = git://github.com/visionmedia/jade.git
+[submodule "support/haml"]
+	path = support/haml
+	url = git://github.com/visionmedia/haml.js.git
diff --git a/Makefile b/Makefile
@@ -30,6 +30,7 @@ test:
 	@CONNECT_ENV=test ./support/expresso/bin/expresso \
 		-I lib \
 		-I support/connect/lib \
+		-I support/haml/lib \
 		-I support/jade/lib \
 		test/*.test.js
 

diff --git a/support/haml b/support/haml
diff --git a/test/fixtures/hello.haml b/test/fixtures/hello.haml
@@ -0,0 +1 @@
+%p Hello World
diff --git a/test/view.test.js b/test/view.test.js
@@ -9,20 +9,30 @@ module.exports = {
     'test #render()': function(assert){
         var app = express.createServer();
         app.set('views', __dirname + '/fixtures');
+
         app.get('/', function(req, res){
             res.render('index.jade', { layout: false });
         });
+        app.get('/haml', function(req, res){
+            res.render('hello.haml', { layout: false });
+        });
+
         assert.response(app,
             { url: '/' },
             { body: '<p>Welcome</p>' });
+        assert.response(app,
+            { url: '/haml' },
+            { body: '\n<p>Hello World</p>' });
     },
 
     'test #render() layout': function(assert){
         var app = express.createServer();
         app.set('views', __dirname + '/fixtures');
+
         app.get('/', function(req, res){
             res.render('index.jade');
         });
+
         assert.response(app,
             { url: '/' },
             { body: '<html><body><p>Welcome</p></body></html>' });
@@ -31,9 +41,11 @@ module.exports = {
     'test #render() specific layout': function(assert){
         var app = express.createServer();
         app.set('views', __dirname + '/fixtures');
+
         app.get('/', function(req, res){
             res.render('index.jade', { layout: 'cool.layout.jade' });
         });
+
         assert.response(app,
             { url: '/' },
             { body: '<cool><p>Welcome</p></cool>' });
@@ -42,9 +54,11 @@ module.exports = {
     'test #partial()': function(assert){
         var app = express.createServer();
         app.set('views', __dirname + '/fixtures');
+
         app.get('/', function(req, res){
             res.render('items.jade', { locals: { items: ['one', 'two'] }});
         });
+
         assert.response(app,
             { url: '/' },
             { body: '<html><body><ul><li>one</li><li>two</li></ul></body></html>' });