From dc5caebbf860c5f77011be3c3aaabd1ac049c61e Mon Sep 17 00:00:00 2001 From: Tj Holowaychuk Date: Wed, 7 Jul 2010 15:10:16 -0700 Subject: [PATCH] Added haml test --- .gitmodules | 3 +++ Makefile | 1 + support/haml | 1 + test/fixtures/hello.haml | 1 + test/view.test.js | 14 ++++++++++++++ 5 files changed, 20 insertions(+) create mode 160000 support/haml create mode 100644 test/fixtures/hello.haml diff --git a/.gitmodules b/.gitmodules index ffded4872a..60cf8d90bf 100644 --- 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 index 48acf3d7a2..d8a2b545a0 100644 --- 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 new file mode 160000 index 0000000000..015e921327 --- /dev/null +++ b/support/haml @@ -0,0 +1 @@ +Subproject commit 015e921327472a096717176a58842f8c1b845fb7 diff --git a/test/fixtures/hello.haml b/test/fixtures/hello.haml new file mode 100644 index 0000000000..16813d1a28 --- /dev/null +++ b/test/fixtures/hello.haml @@ -0,0 +1 @@ +%p Hello World \ No newline at end of file diff --git a/test/view.test.js b/test/view.test.js index e10b8e697a..98d32d0e13 100644 --- 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: '

Welcome

' }); + assert.response(app, + { url: '/haml' }, + { body: '\n

Hello World

' }); }, '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: '

Welcome

' }); @@ -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: '

Welcome

' }); @@ -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: '' });