Skip to content

Commit

Permalink
deps: remove sinon (#3171)
Browse files Browse the repository at this point in the history
  • Loading branch information
Uzlopak committed Apr 27, 2024
1 parent 51a97af commit 24f7ee6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
1 change: 0 additions & 1 deletion package.json
Expand Up @@ -119,7 +119,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",
Expand Down
19 changes: 13 additions & 6 deletions test/env-http-proxy-agent.js
Expand Up @@ -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')

Expand Down Expand Up @@ -174,15 +173,23 @@ 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((agentSymbol) => {
dispatcher[agentSymbol].dispatch.called = false
})
return result
}
const doesNotProxy = usesProxyAgent.bind(this, kNoProxyAgent)
Expand Down

0 comments on commit 24f7ee6

Please sign in to comment.