OSSForks/express
1
0
Fork 0
mirror of https://github.com/zebrajr/express.git synced 2026-01-15 12:15:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge tag '4.14.0'

Browse Source
This commit is contained in:
Douglas Christopher Wilson
2016-06-20 00:37:34 -04:00
parent 8a387d3ede 9375a9afa9
commit 1dbfee6623
28 changed files with 521 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/res.jsonp.js
View File

@@ -2,6 +2,7 @@
var express = require('../')
, request = require('supertest')
, assert = require('assert');
var utils = require('./support/utils');
describe('res', function(){
describe('.jsonp(object)', function(){
@@ -136,11 +137,8 @@ describe('res', function(){
request(app)
.get('/')
.expect('Content-Type', 'application/vnd.example+json; charset=utf-8')
.expect(200, '{"hello":"world"}', function (err, res) {
if (err) return done(err);
res.headers.should.not.have.property('x-content-type-options');
done();
});
.expect(utils.shouldNotHaveHeader('X-Content-Type-Options'))
.expect(200, '{"hello":"world"}', done);
})
it('should override previous Content-Types with callback', function(done){