Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove header property value validation #1115

Merged
merged 2 commits into from
Oct 9, 2017
Merged

Remove header property value validation #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c1abbd
Remove header property validation
refactornator Sep 25, 2017
1170d8f
Merge branch 'master' into master
shellscape Oct 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/optionsSchema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@
},
"headers": {
"description": "Response headers that are added to each response.",
"additionalProperties": {
"type": "string"
},
"type": "object"
},
"clientLogLevel": {
Expand Down
104 changes: 66 additions & 38 deletions test/Routes.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,53 +13,81 @@ describe('Routes', () => {
let server;
let req;

before((done) => {
server = helper.start(config, {
headers: { 'X-Foo': '1' }
}, done);
req = request(server.app);
});
describe('without headers', () => {
before((done) => {
server = helper.start(config, {}, done);
req = request(server.app);
});

after(helper.close);
after(helper.close);

it('GET request to inline bundle', (done) => {
req.get('/webpack-dev-server.js')
.expect('Content-Type', 'application/javascript')
.expect(200, done);
});
it('GET request to inline bundle', (done) => {
req.get('/webpack-dev-server.js')
.expect('Content-Type', 'application/javascript')
.expect(200, done);
});

it('GET request to live bundle', (done) => {
req.get('/__webpack_dev_server__/live.bundle.js')
.expect('Content-Type', 'application/javascript')
.expect(200, done);
});
it('GET request to live bundle', (done) => {
req.get('/__webpack_dev_server__/live.bundle.js')
.expect('Content-Type', 'application/javascript')
.expect(200, done);
});

it('GET request to sockjs bundle', (done) => {
req.get('/__webpack_dev_server__/sockjs.bundle.js')
.expect('Content-Type', 'application/javascript')
.expect(200, done);
});
it('GET request to sockjs bundle', (done) => {
req.get('/__webpack_dev_server__/sockjs.bundle.js')
.expect('Content-Type', 'application/javascript')
.expect(200, done);
});

it('GET request to live html', (done) => {
req.get('/webpack-dev-server/')
.expect('Content-Type', 'text/html')
.expect(200, /__webpack_dev_server__/, done);
});
it('GET request to live html', (done) => {
req.get('/webpack-dev-server/')
.expect('Content-Type', 'text/html')
.expect(200, /__webpack_dev_server__/, done);
});

it('GET request to directory index', (done) => {
req.get('/webpack-dev-server')
.expect('Content-Type', 'text/html')
.expect(200, directoryIndex.trim(), done);
it('GET request to directory index', (done) => {
req.get('/webpack-dev-server')
.expect('Content-Type', 'text/html')
.expect(200, directoryIndex.trim(), done);
});

it('GET request to magic html', (done) => {
req.get('/bundle')
.expect(200, magicHtml.trim(), done);
});
});

it('GET request to magic html', (done) => {
req.get('/bundle')
.expect(200, magicHtml.trim(), done);
describe('headers as a string', () => {
before((done) => {
server = helper.start(config, {
headers: { 'X-Foo': '1' }
}, done);
req = request(server.app);
});

after(helper.close);

it('GET request with headers', (done) => {
req.get('/bundle')
.expect('X-Foo', '1')
.expect(200, done);
});
});

it('GET request with headers', (done) => {
req.get('/bundle')
.expect('X-Foo', '1')
.expect(200, done);
describe('headers as an array', () => {
before((done) => {
server = helper.start(config, {
headers: { 'X-Bar': ['key1=value1', 'key2=value2'] }
}, done);
req = request(server.app);
});

after(helper.close);

it('GET request with headers as an array', (done) => {
req.get('/bundle')
.expect('X-Bar', 'key1=value1, key2=value2')
.expect(200, done);
});
});
});