test: add test for enforceEnconding

Author: bjohansebas

index.js

@@ -45,7 +45,7 @@ var cacheControlNoTransformRegExp = /(?:^|,)\s*?no-transform\s*?(?:,|$)/
 var SUPPORTED_ENCODING = hasBrotliSupport ? ['br', 'gzip', 'deflate', 'identity'] : ['gzip', 'deflate', 'identity']
 var PREFERRED_ENCODING = hasBrotliSupport ? ['br', 'gzip'] : ['gzip']
 
-var encodingSupported = ['*', 'gzip', 'deflate', 'identity']
+var encodingSupported = ['*', 'gzip', 'deflate', 'identity', 'br']
 
 /**
  * Compress response data with gzip / deflate.
@@ -202,11 +202,16 @@ function compression (options) {
         method = enforceEncoding === '*' ? 'gzip' : enforceEncoding
       }
 
+      console.log(method)
+
       // negotiation failed
       if (!method || method === 'identity') {
         nocompress('not acceptable')
         return
       }
+
+      console.log(optsBrotli)
+      console.log(opts)
       // compression stream
       debug('%s compression', method)
       stream = method === 'gzip'

test/compression.js

@@ -485,7 +485,8 @@ describe('compression()', function () {
       request(server)
         .get('/')
         .set('Accept-Encoding', 'gzip')
-        .expect('Content-Encoding', 'gzip', done)
+        .expect('Content-Encoding', 'gzip')
+        .expect(200, 'hello, world', done)
     })
 
     it('should return false writing after end', function (done) {
@@ -513,7 +514,8 @@ describe('compression()', function () {
       request(server)
         .get('/')
         .set('Accept-Encoding', 'deflate')
-        .expect('Content-Encoding', 'deflate', done)
+        .expect('Content-Encoding', 'deflate')
+        .expect(200, 'hello, world', done)
     })
   })
 
@@ -527,7 +529,8 @@ describe('compression()', function () {
       request(server)
         .get('/')
         .set('Accept-Encoding', 'br')
-        .expect('Content-Encoding', 'br', done)
+        .expect('Content-Encoding', 'br')
+        .expect(200, 'hello, world', done)
     })
   })
 
@@ -934,6 +937,19 @@ describe('compression()', function () {
         .expect(200, 'hello, world', done)
     })
 
+    brotli('should compress when enforceEncoding is brotli', function (done) {
+      var server = createServer({ threshold: 0, enforceEncoding: 'br' }, function (req, res) {
+        res.setHeader('Content-Type', 'text/plain')
+        res.end('hello, world')
+      })
+
+      request(server)
+        .get('/')
+        .set('Accept-Encoding', '')
+        .expect('Content-Encoding', 'br')
+        .expect(200, 'hello, world', done)
+    })
+
     it('should not compress when enforceEncoding is unknown', function (done) {
       var server = createServer({ threshold: 0, enforceEncoding: 'bogus' }, function (req, res) {
         res.setHeader('Content-Type', 'text/plain')