Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions lib/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,22 @@ function View(name, options) {
if (!opts.engines[this.ext]) {
// load engine
var mod = this.ext.slice(1)
debug('require "%s"', mod)

// default engine export
var fn = require(mod).__express
// path.extname('index.') returns '.', so mod is ''. Avoid require('')
// which throws an opaque TypeError; leave the engine unset so lookup
// fails cleanly with "Failed to lookup view".
if (mod) {
debug('require "%s"', mod)

if (typeof fn !== 'function') {
throw new Error('Module "' + mod + '" does not provide a view engine.')
}
// default engine export
var fn = require(mod).__express

if (typeof fn !== 'function') {
throw new Error('Module "' + mod + '" does not provide a view engine.')
}

opts.engines[this.ext] = fn
opts.engines[this.ext] = fn
}
}

// store loaded engine
Expand Down
12 changes: 12 additions & 0 deletions test/app.render.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,18 @@ describe('app', function(){
done();
});
})

it('should provide a helpful error for a name ending in "."', function(done){
var app = createApp();

app.set('views', path.join(__dirname, 'fixtures'))
app.set('view engine', 'tmpl')
app.render('index.', function (err) {
assert.ok(err)
assert.ok(err.message.indexOf('Failed to lookup view "index."') === 0)
done();
});
})
})

describe('when an error occurs', function(){
Expand Down