Skip to content

Commit

Permalink
feat(mock): allow matching the complete header list (nodejs#1275)
Browse files Browse the repository at this point in the history
  • Loading branch information
panva authored and crysmags committed Feb 27, 2024
1 parent b2c4c3d commit 33b2536
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 1 deletion.
11 changes: 11 additions & 0 deletions lib/mock/mock-utils.js
Expand Up @@ -24,7 +24,18 @@ function matchValue (match, value) {
return false
}

function lowerCaseEntries (headers) {
return Object.fromEntries(
Object.entries(headers).map(([headerName, headerValue]) => {
return [headerName.toLocaleLowerCase(), headerValue]
})
)
}

function matchHeaders (mockDispatch, headers) {
if (typeof mockDispatch.headers === 'function') {
return mockDispatch.headers(headers ? lowerCaseEntries(headers) : {})
}
if (typeof mockDispatch.headers === 'undefined') {
return true
}
Expand Down
56 changes: 56 additions & 0 deletions test/mock-agent.js
Expand Up @@ -2293,3 +2293,59 @@ test('MockAgent - disableNetConnect should throw if dispatch not found by net co
method: 'GET'
}), new MockNotMatchedError(`Mock dispatch not matched for path '/foo': subsequent request to origin ${baseUrl} was not allowed (net.connect disabled)`))
})

test('MockAgent - headers function interceptor', async (t) => {
t.plan(7)

const server = createServer((req, res) => {
t.fail('should not be called')
t.end()
res.end('should not be called')
})
t.teardown(server.close.bind(server))

await promisify(server.listen.bind(server))(0)

const baseUrl = `http://localhost:${server.address().port}`

const mockAgent = new MockAgent()
setGlobalDispatcher(mockAgent)
t.teardown(mockAgent.close.bind(mockAgent))
const mockPool = mockAgent.get(baseUrl)

// Disable net connect so we can make sure it matches properly
mockAgent.disableNetConnect()

mockPool.intercept({
path: '/foo',
method: 'GET',
headers (headers) {
t.equal(typeof headers, 'object')
return !Object.keys(headers).includes('authorization')
}
}).reply(200, 'foo').times(2)

await t.rejects(request(`${baseUrl}/foo`, {
method: 'GET',
headers: {
Authorization: 'Bearer foo'
}
}), new MockNotMatchedError(`Mock dispatch not matched for headers '{"Authorization":"Bearer foo"}': subsequent request to origin ${baseUrl} was not allowed (net.connect disabled)`))

{
const { statusCode } = await request(`${baseUrl}/foo`, {
method: 'GET',
headers: {
foo: 'bar'
}
})
t.equal(statusCode, 200)
}

{
const { statusCode } = await request(`${baseUrl}/foo`, {
method: 'GET'
})
t.equal(statusCode, 200)
}
})
7 changes: 7 additions & 0 deletions test/types/mock-interceptor.test-d.ts
Expand Up @@ -61,3 +61,10 @@ import { MockInterceptor, MockScope } from '../../types/mock-interceptor'
// times
expectAssignable<MockScope>(mockScope.times(2))
}

{
const mockPool: MockPool = new MockAgent().get('')
mockPool.intercept({ path: '', method: 'GET', headers: () => true })
mockPool.intercept({ path: '', method: 'GET', headers: () => false })
mockPool.intercept({ path: '', method: 'GET', headers: (headers) => Object.keys(headers).includes('authorization') })
}
2 changes: 1 addition & 1 deletion types/mock-interceptor.d.ts
Expand Up @@ -49,7 +49,7 @@ declare namespace MockInterceptor {
/** Body to intercept on. */
body?: string | RegExp | ((body: string) => boolean);
/** Headers to intercept on. */
headers?: Record<string, string | RegExp | ((body: string) => boolean)>;
headers?: Record<string, string | RegExp | ((body: string) => boolean)> | ((headers: Record<string, string>) => boolean);
}
export interface MockDispatch<TData extends object = object, TError extends Error = Error> extends Options {
times: number | null;
Expand Down

0 comments on commit 33b2536

Please sign in to comment.