refactor: simplify event listener methods in intercept functions

Signed-off-by: Sebastian Beltran <[email protected]>

Author: bjohansebas

index.js

@@ -299,34 +299,22 @@ function interceptAddListener (ee, fn) {
   var _on = ee.on
 
   if (_addListener) {
-    Object.defineProperty(ee, 'addListener', {
-      configurable: true,
-      value: addListener,
-      writable: true
-    })
+    ee.addListener = function addListener (type, listener) {
+      return fn.call(this, type, listener) === false
+        ? _addListener.call(this, type, listener)
+        : this
+    }
   }
 
   if (_on) {
-    Object.defineProperty(ee, 'on', {
-      configurable: true,
-      value: on,
-      writable: true
-    })
+    ee.on = function on (type, listener) {
+      return fn.call(this, type, listener) === false
+        ? _on.call(this, type, listener)
+        : this
+    }
   }
 
   return _addListener || _on || noop
-
-  function addListener (type, listener) {
-    return fn.call(this, type, listener) === false
-      ? _addListener.call(this, type, listener)
-      : this
-  }
-
-  function on (type, listener) {
-    return fn.call(this, type, listener) === false
-      ? _on.call(this, type, listener)
-      : this
-  }
 }
 
 /**
@@ -339,34 +327,22 @@ function interceptRemoveListener (ee, fn) {
   var _off = ee.off
 
   if (_removeListener) {
-    Object.defineProperty(ee, 'removeListener', {
-      configurable: true,
-      value: removeListener,
-      writable: true
-    })
+    ee.removeListener = function removeListener(type, listener) {
+      return fn.call(this, type, listener) === false
+        ? _removeListener.call(this, type, listener)
+        : this;
+    };
   }
 
   if (_off) {
-    Object.defineProperty(ee, 'off', {
-      configurable: true,
-      value: off,
-      writable: true
-    })
+    ee.off = function off(type, listener) {
+      return fn.call(this, type, listener) === false
+        ? _off.call(this, type, listener)
+        : this;
+    };
   }
 
   return _removeListener || _off || noop
-
-  function removeListener (type, listener) {
-    return fn.call(this, type, listener) === false
-      ? _removeListener.call(this, type, listener)
-      : this
-  }
-
-  function off (type, listener) {
-    return fn.call(this, type, listener) === false
-      ? _off.call(this, type, listener)
-      : this
-  }
 }
 
 /**

test/compression.js

@@ -368,9 +368,6 @@ describe('compression()', function () {
     })
 
     it('should support off("drain") after addListener("drain")', function (done) {
-      if (!require('events').EventEmitter.prototype.off) { // off was added in Node.js v10
-        this.skip()
-      }
       var hasWarned = false
       var onWarning = function () {
         hasWarned = true
@@ -460,9 +457,6 @@ describe('compression()', function () {
     it('should not leak event listeners when res.unpipe() is used (#135)', function (done) {
       // unpipe and stream.Readable were added in v0.9.4
       var stream = require('stream')
-      if (!(stream.Readable && stream.Readable.prototype.unpipe)) {
-        this.skip()
-      }
 
       var hasWarned = false
       var onWarning = function () {
@@ -1457,13 +1451,6 @@ function createServer (opts, fn) {
         return
       }
 
-      if (typeof res.getMaxListeners !== 'function') {
-        // Added in v0.11.2
-        res.getMaxListeners = function getMaxListeners () {
-          return 10
-        }
-      }
-
       fn(req, res)
     })
   })