Skip to content

Commit 19a2eeb

Browse files
kunalspathakdougwilson
authored andcommitted
tests: check render error without engine-specific message
closes #3251
1 parent d7da225 commit 19a2eeb

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

test/app.render.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,10 @@ describe('app', function(){
9797

9898
app.set('views', path.join(__dirname, 'fixtures'))
9999

100-
app.render('user.tmpl', function (err, str) {
101-
// nextTick to prevent cyclic
102-
process.nextTick(function(){
103-
err.message.should.match(/Cannot read property '[^']+' of undefined/);
104-
done();
105-
});
100+
app.render('user.tmpl', function (err) {
101+
assert.ok(err)
102+
assert.equal(err.name, 'RenderError')
103+
done()
106104
})
107105
})
108106
})

test/res.render.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ describe('res', function(){
105105
});
106106

107107
app.use(function(err, req, res, next){
108-
res.end(err.message);
108+
res.status(500).send('got error: ' + err.name)
109109
});
110110

111111
request(app)
112112
.get('/')
113-
.expect(/Cannot read property '[^']+' of undefined/, done);
113+
.expect(500, 'got error: RenderError', done)
114114
})
115115
})
116116

@@ -329,13 +329,15 @@ describe('res', function(){
329329

330330
app.use(function(req, res){
331331
res.render('user.tmpl', function (err) {
332-
res.end(err.message);
332+
if (err) {
333+
res.status(500).send('got error: ' + err.name)
334+
}
333335
});
334336
});
335337

336338
request(app)
337339
.get('/')
338-
.expect(/Cannot read property '[^']+' of undefined/, done);
340+
.expect(500, 'got error: RenderError', done)
339341
})
340342
})
341343
})

test/support/tmpl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ module.exports = function renderFile(fileName, options, callback) {
1313
str = str.replace(variableRegExp, generateVariableLookup(options));
1414
} catch (e) {
1515
err = e;
16+
err.name = 'RenderError'
1617
}
1718

1819
callback(err, str);

0 commit comments

Comments
 (0)