Remove header property validation

- Allows multiple cookies to be set - Allows Access-Control-Allow-Origin to support multiple domains
webpack · Sep 28, 2017 · 650d9ef · 650d9ef
1 parent 33bef0d
commit 650d9ef
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 40 deletions.
diff --git a/lib/optionsSchema.json b/lib/optionsSchema.json
@@ -64,9 +64,6 @@
     },
     "headers": {
       "description": "Response headers that are added to each response.",
-      "additionalProperties": {
-        "type": "string"
-      },
       "type": "object"
     },
     "clientLogLevel": {

diff --git a/test/Routes.test.js b/test/Routes.test.js
@@ -13,53 +13,90 @@ describe('Routes', () => {
   let server;
   let req;
 
-  before((done) => {
-    server = helper.start(config, {
-      headers: { 'X-Foo': '1' }
-    }, done);
-    req = request(server.app);
-  });
+  describe('bundles', () => {
+    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);
-  });
+  describe('html', () => {
+    before((done) => {
+      server = helper.start(config, {}, done);
+      req = request(server.app);
+    });
+
+    after(helper.close);
+
+    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);
+    });
   });
 });