Skip to content
Open
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion lib/response.js
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ res.sendFile = function sendFile(path, options, callback) {
var pathname = encodeURI(path);

// wire application etag option to send
opts.etag = this.app.enabled('etag');
opts.etag ??= this.app.enabled('etag');
var file = send(req, pathname, opts);

// transfer
Expand Down
22 changes: 22 additions & 0 deletions test/res.sendFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,28 @@ describe('res', function(){
}
});

it('should let an explicit etag option turn the ETag off', function (done) {
var app = createApp(path.resolve(fixtures, 'name.txt'), { etag: false });

request(app)
.get('/')
.expect(handleHeaders)
.expect(200, done);

function handleHeaders (res) {
assert(res.headers.etag === undefined);
}
});

it('should let an explicit etag option turn the ETag on', function (done) {
var app = createApp(path.resolve(fixtures, 'name.txt'), { etag: true }).disable('etag');

request(app)
.get('/')
.expect('ETag', /^(?:W\/)?"[^"]+"$/)
.expect(200, done);
});

it('should 404 for directory', function (done) {
var app = createApp(path.resolve(fixtures, 'blog'));

Expand Down