diff --git a/package.json b/package.json index cf4c7662aeb..e37c7dbf8d0 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,6 @@ "node-forge": "^1.3.1", "pre-commit": "^1.2.2", "proxy": "^2.1.1", - "sinon": "^17.0.1", "snazzy": "^9.0.0", "standard": "^17.0.0", "tsd": "^0.31.0", diff --git a/test/env-http-proxy-agent.js b/test/env-http-proxy-agent.js index 4949df9f5f8..00320a2d8c8 100644 --- a/test/env-http-proxy-agent.js +++ b/test/env-http-proxy-agent.js @@ -2,7 +2,6 @@ const { tspl } = require('@matteo.collina/tspl') const { test, describe, after, beforeEach } = require('node:test') -const sinon = require('sinon') const { EnvHttpProxyAgent, ProxyAgent, Agent, fetch, MockAgent } = require('..') const { kNoProxyAgent, kHttpProxyAgent, kHttpsProxyAgent, kClosed, kDestroyed, kProxy } = require('../lib/core/symbols') @@ -174,15 +173,22 @@ const createEnvHttpProxyAgentWithMocks = (plan = 1, opts = {}) => { process.env.https_proxy = 'http://localhost:8443' const dispatcher = new EnvHttpProxyAgent({ ...opts, factory }) const agentSymbols = [kNoProxyAgent, kHttpProxyAgent, kHttpsProxyAgent] - agentSymbols.forEach((agent) => { - sinon.spy(dispatcher[agent], 'dispatch') + agentSymbols.forEach((agentSymbol) => { + const originalDispatch = dispatcher[agentSymbol].dispatch + dispatcher[agentSymbol].dispatch = function () { + dispatcher[agentSymbol].dispatch.called = true + return originalDispatch.apply(this, arguments) + } + dispatcher[agentSymbol].dispatch.called = false }) const usesProxyAgent = async (agent, url) => { await fetch(url, { dispatcher }) const result = agentSymbols.every((agentSymbol) => agent === agentSymbol - ? dispatcher[agentSymbol].dispatch.called - : dispatcher[agentSymbol].dispatch.notCalled) - agentSymbols.forEach((agent) => { dispatcher[agent].dispatch.resetHistory() }) + ? dispatcher[agentSymbol].dispatch.called === true + : dispatcher[agentSymbol].dispatch.called === false) + agentSymbols.forEach((agent) => { + dispatcher[agent].dispatch.called = false + }) return result } const doesNotProxy = usesProxyAgent.bind(this, kNoProxyAgent)