Special-case html charset to prevent possible breaking change

Author: gpoitch

lib/middleware.js

@@ -72,7 +72,9 @@ module.exports = function wrapper(context) {
 
         let contentType = mime.getType(filename);
         const mimeInfo = mimeDb[contentType];
-        const charset = mimeInfo && mimeInfo.charset;
+        const charset = (mimeInfo && mimeInfo.charset)
+          // Special-cased to prevent possible breaking change
+          || (contentType === 'text/html' && 'UTF-8');
 
         if (charset) {
           contentType += `; charset=${charset}`;

test/tests/server.js

@@ -96,7 +96,7 @@ describe('Server', () => {
 
     it('request to directory', (done) => {
       request(app).get('/public/')
-        .expect('Content-Type', 'text/html')
+        .expect('Content-Type', 'text/html; charset=UTF-8')
         .expect('Content-Length', '10')
         .expect(200, /My Index\./, done);
     });
@@ -167,7 +167,6 @@ describe('Server', () => {
 
     it('request to directory', (done) => {
       request(app).get('/')
-        .expect('Content-Type', 'text/html; charset=utf-8')
         .expect(404, done);
     });
   });
@@ -240,7 +239,7 @@ describe('Server', () => {
     it('request to Index.phtml', (done) => {
       request(app).get('/')
         .expect('welcome')
-        .expect('Content-Type', /text\/html/)
+        .expect('Content-Type', 'text/html; charset=UTF-8')
         .expect(200, done);
     });