Merge branch 'master' of github.com:koajs/koa

This commit is contained in:
TJ Holowaychuk 2013-11-13 21:11:28 -08:00
commit d247e7835c
2 changed files with 0 additions and 17 deletions

View file

@ -339,17 +339,6 @@ Response.prototype = {
this.set('ETag', val); this.set('ETag', val);
}, },
/**
* Get the ETag of a response.
*
* @return {String}
* @api public
*/
get etag() {
return this.get('etag');
},
/** /**
* Return the request mime type void of * Return the request mime type void of
* parameters such as "charset". * parameters such as "charset".

View file

@ -19,10 +19,4 @@ describe('res.etag', function(){
res.etag = 'asdf'; res.etag = 'asdf';
res.header.etag.should.equal('"asdf"'); res.header.etag.should.equal('"asdf"');
}) })
it('should get the etag', function(){
var res = response();
res.set('etag', '"asdf"');
res.etag.should.equal('"asdf"');
})
}) })