Refactoring

Author: ehmicky

test/exit.js

@@ -9,35 +9,29 @@ import { EXIT_TIMEOUT, EXIT_CODE } from '../src/exit.js'
 
 import { emit } from './helpers/events.js'
 import {
-  stubProcessClock,
-  unStubProcessClock,
+  startClockLogging,
   startExitLogging,
   startProcessLogging,
 } from './helpers/exit.js'
 import { removeProcessListeners } from './helpers/remove.js'
-import { startLogging } from './helpers/start.js'
 
 const pNextTick = promisify(nextTick)
 removeProcessListeners()
 
 test.serial('call process.exit() after a timeout', async (t) => {
-  const clock = stubProcessClock()
-  const { stopLogging } = startLogging({ exit: true })
+  const { clock, stopLogging } = startClockLogging({ exit: true })
 
   await emit('uncaughtException')
   t.deepEqual(process.exit.args, [])
   clock.tick(EXIT_TIMEOUT)
   t.deepEqual(process.exit.args, [[EXIT_CODE]])
 
   stopLogging()
-  unStubProcessClock(clock)
 })
 
-// eslint-disable-next-line max-statements
 test.serial('wait for async onError() before exiting', async (t) => {
-  const clock = stubProcessClock()
   const onErrorDuration = 1e5
-  const { stopLogging } = startLogging({
+  const { clock, stopLogging } = startClockLogging({
     async onError() {
       await promisify(setTimeout)(onErrorDuration)
     },
@@ -52,7 +46,6 @@ test.serial('wait for async onError() before exiting', async (t) => {
   t.deepEqual(process.exit.args, [[EXIT_CODE]])
 
   stopLogging()
-  unStubProcessClock(clock)
 })
 
 test.serial('exit process if "exit: true"', async (t) => {

test/helpers/exit.js

@@ -35,13 +35,26 @@ const stopExitLogging = function (stopLogging) {
   unStubProcessExit()
 }
 
+// Start logging while `setTimeout()` and `process.exit()` are being stubbed
+export const startClockLogging = function (opts) {
+  const clock = stubProcessClock()
+  const { stopLogging } = startLogging(opts)
+  const stopLoggingA = stopClockLogging.bind(undefined, stopLogging, clock)
+  return { clock, stopLogging: stopLoggingA }
+}
+
+const stopClockLogging = function (stopLogging, clock) {
+  stopLogging()
+  unStubProcessClock(clock)
+}
+
 // Stub `setTimeout()` and `process.exit()`
-export const stubProcessClock = function () {
+const stubProcessClock = function () {
   stubProcessExit()
   return fakeTimers.install({ toFake: ['setTimeout'] })
 }
 
-export const unStubProcessClock = function (clock) {
+const unStubProcessClock = function (clock) {
   unStubProcessExit()
   clock.uninstall()
 }