Skip to content

Commit

Permalink
Update [email protected]
Browse files Browse the repository at this point in the history
  • Loading branch information
@hueniverse
hueniverse committed Aug 26, 2016
1 parent e780f2e commit b901034
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
2 changes: 1 addition & 1 deletion npm-shrinkwrap.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 21 additions & 5 deletions test/cors.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://example.com/' } }, (res) => {

expect(res.statusCode).to.equal(200);
expect(res.result).to.equal(null);
expect(res.headers['access-control-allow-credentials']).to.equal('true');
done();
Expand All @@ -220,24 +221,28 @@ describe('CORS', () => {
server.connection({ routes: { cors: { origin: ['http://example.com/'] } } });
server.route({ method: 'GET', path: '/', handler, config: { cors: { credentials: true } } });

server.inject({ url: '/', headers: { origin: 'http://example.com/' } }, (res1) => {
server.inject({ url: '/', headers: { origin: 'http://example.com/', 'access-control-request-method': 'GET' } }, (res1) => {

expect(res1.statusCode).to.equal(200);
expect(res1.result).to.equal(null);
expect(res1.headers['access-control-allow-credentials']).to.equal('true');

server.inject({ methof: 'OPTIONS', url: '/', headers: { origin: 'http://example.com/' } }, (res2) => {
server.inject({ method: 'OPTIONS', url: '/', headers: { origin: 'http://example.com/', 'access-control-request-method': 'GET' } }, (res2) => {

expect(res2.statusCode).to.equal(200);
expect(res2.result).to.equal(null);
expect(res2.headers['access-control-allow-credentials']).to.equal('true');

server.inject({ url: '/', headers: { origin: 'http://example.org/' } }, (res3) => {
server.inject({ url: '/', headers: { origin: 'http://example.org/', 'access-control-request-method': 'GET' } }, (res3) => {

expect(res3.statusCode).to.equal(200);
expect(res3.result).to.equal(null);
expect(res3.headers['access-control-allow-credentials']).to.not.exist();

server.inject({ methof: 'OPTIONS', url: '/', headers: { origin: 'http://example.org/' } }, (res4) => {
server.inject({ method: 'OPTIONS', url: '/', headers: { origin: 'http://example.org/', 'access-control-request-method': 'GET' } }, (res4) => {

expect(res4.result).to.equal(null);
expect(res4.statusCode).to.equal(200);
expect(res4.result).to.equal({ message: 'CORS error: Origin not allowed' });
expect(res4.headers['access-control-allow-credentials']).to.not.exist();
expect(res4.headers['access-control-allow-origin']).to.not.exist();
done();
Expand All @@ -262,12 +267,14 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://example.com/' } }, (res1) => {

expect(res1.statusCode).to.equal(200);
expect(res1.result).to.exist();
expect(res1.result).to.equal('ok');
expect(res1.headers['access-control-allow-origin']).to.equal('http://example.com/');

server.inject({ method: 'OPTIONS', url: '/', headers: { origin: 'http://example.com/', 'access-control-request-method': 'GET' } }, (res2) => {

expect(res2.statusCode).to.equal(200);
expect(res2.result).to.be.null();
expect(res2.headers['access-control-allow-origin']).to.equal('http://example.com/');
done();
Expand All @@ -288,6 +295,7 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://x.example.com' } }, (res) => {

expect(res.statusCode).to.equal(200);
expect(res.result).to.exist();
expect(res.result).to.equal('ok');
expect(res.headers['access-control-allow-origin']).to.equal('http://x.example.com');
Expand Down Expand Up @@ -328,6 +336,7 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://example.com/' } }, (res) => {

expect(res.statusCode).to.equal(200);
expect(res.result).to.exist();
expect(res.result).to.equal('ok');
expect(res.headers['access-control-expose-headers']).to.equal('something,WWW-Authenticate,Server-Authorization,xyz');
Expand All @@ -348,6 +357,7 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://x.example.com' } }, (res) => {

expect(res.statusCode).to.equal(200);
expect(res.result).to.exist();
expect(res.result).to.equal('ok');
expect(res.headers['access-control-allow-origin']).to.not.exist();
Expand All @@ -368,6 +378,7 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://www.example.com' } }, (res) => {

expect(res.statusCode).to.equal(200);
expect(res.result).to.exist();
expect(res.result).to.equal('Tada');
expect(res.headers['access-control-allow-origin']).to.equal('http://www.example.com');
Expand All @@ -389,6 +400,7 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://www.example.com' } }, (res) => {

expect(res.statusCode).to.equal(200);
expect(res.result).to.exist();
expect(res.result).to.equal('Tada');
expect(res.headers['access-control-allow-origin']).to.equal('http://www.example.com');
Expand All @@ -410,6 +422,7 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://www.a.com' } }, (res) => {

expect(res.statusCode).to.equal(200);
expect(res.result).to.exist();
expect(res.result).to.equal('Tada');
expect(res.headers['access-control-allow-origin']).to.equal('http://www.a.com');
Expand All @@ -431,6 +444,7 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://www.a.com' } }, (res) => {

expect(res.statusCode).to.equal(200);
expect(res.result).to.exist();
expect(res.result).to.equal('Tada');
expect(res.headers['access-control-allow-origin']).to.equal('http://www.a.com');
Expand All @@ -452,11 +466,13 @@ describe('CORS', () => {

server.inject({ url: '/', headers: { origin: 'http://example.com/', 'access-control-request-method': 'GET' } }, (res1) => {

expect(res1.statusCode).to.equal(200);
expect(res1.headers['access-control-allow-origin']).to.equal('http://example.com/');
expect(res1.headers['access-control-expose-headers']).to.not.exist();

server.inject({ method: 'OPTIONS', url: '/', headers: { origin: 'http://example.com/', 'access-control-request-method': 'GET' } }, (res2) => {

expect(res2.statusCode).to.equal(200);
expect(res2.headers['access-control-allow-origin']).to.equal('http://example.com/');
expect(res2.headers['access-control-expose-headers']).to.not.exist();
done();
Expand Down

0 comments on commit b901034

Please sign in to comment.