fix(socket): When Socket#setTimeout gets a callback, should still emit

Ref #1404
nock · Feb 4, 2019 · a07b0ba · a07b0ba
1 parent 69ba3c3
commit a07b0ba
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/lib/socket.js b/lib/socket.js
@@ -38,21 +38,17 @@ util.inherits(Socket, EventEmitter)
 
 Socket.prototype.setTimeout = function setTimeout(timeoutMs, fn) {
   this.timeoutMs = timeoutMs
-  this.timeoutFunction = fn
+  if (fn) {
+    this.once('timeout', fn)
+  }
 }
 
 Socket.prototype.applyDelay = function applyDelay(delayMs) {
   this.totalDelayMs += delayMs
 
   if (this.timeoutMs && this.totalDelayMs > this.timeoutMs) {
     debug('socket timeout')
-    // TODO-coverage: Rewrite this so it always emits. In `setTimeout()`, if a
-    // timeout function is passed, register it using `this.once('timeout')`.
-    if (this.timeoutFunction) {
-      this.timeoutFunction()
-    } else {
-      this.emit('timeout')
-    }
+    this.emit('timeout')
   }
 }
 

diff --git a/tests/test_socketdelay.js b/tests/test_socketdelay.js
@@ -95,3 +95,18 @@ test('calling socketDelay not emit a timeout if not idle for long enough', t =>
 
   req.end()
 })
+
+test('Socket#setTimeout adds callback as a one-time listener for parity with a real socket', t => {
+  nock('http://example.test')
+    .get('/')
+    .socketDelay(100)
+    .reply(200, '<html></html>')
+
+  const onTimeout = () => {
+    t.end()
+  }
+
+  http.get('http://example.test').on('socket', socket => {
+    socket.setTimeout(50, onTimeout)
+  })
+})