Skip to content

chore: remove tspl and use testcontext for test/interceptors #4573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: remove tspl and use testcontext for test/interceptors #4573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 22 additions & 23 deletions test/interceptors/cache-query-params.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
'use strict'

const { test, after } = require('node:test')
const { equal, notEqual } = require('node:assert')
const { createServer } = require('node:http')
const { once } = require('node:events')
const { Client, request, interceptors } = require('../../')

test('query parameters create separate cache entries', async () => {
test('query parameters create separate cache entries', async (t) => {
let requestCount = 0
const server = createServer((req, res) => {
requestCount++
Expand Down Expand Up @@ -42,28 +41,28 @@ test('query parameters create separate cache entries', async () => {
query: { param: 'value1' }
})
const body1 = await response1.body.text()
equal(requestCount, 1, 'First request should hit the server')
t.assert.strictEqual(requestCount, 1, 'First request should hit the server')

// Second request with same param - should be cached
const response2 = await request(origin, {
dispatcher: client,
query: { param: 'value1' }
})
const body2 = await response2.body.text()
equal(requestCount, 1, 'Second request with same query should be cached')
equal(body1, body2, 'Cached response should match original')
t.assert.strictEqual(requestCount, 1, 'Second request with same query should be cached')
t.assert.strictEqual(body1, body2, 'Cached response should match original')

// Third request with different param - should NOT be cached
const response3 = await request(origin, {
dispatcher: client,
query: { param: 'value2' }
})
const body3 = await response3.body.text()
equal(requestCount, 2, 'Request with different query should hit the server')
notEqual(body1, body3, 'Different query parameters should create separate cache entries')
t.assert.strictEqual(requestCount, 2, 'Request with different query should hit the server')
t.assert.notStrictEqual(body1, body3, 'Different query parameters should create separate cache entries')
})

test('complex query parameters are handled correctly', async () => {
test('complex query parameters are handled correctly', async (t) => {
let requestCount = 0
const server = createServer((req, res) => {
requestCount++
Expand Down Expand Up @@ -105,16 +104,16 @@ test('complex query parameters are handled correctly', async () => {
query: complexQuery
})
const body1 = await response1.body.text()
equal(requestCount, 1, 'First complex query should hit the server')
t.assert.strictEqual(requestCount, 1, 'First complex query should hit the server')

// Same complex query - should be cached
const response2 = await request(origin, {
dispatcher: client,
query: complexQuery
})
const body2 = await response2.body.text()
equal(requestCount, 1, 'Same complex query should be cached')
equal(body1, body2, 'Complex query parameters should be cached correctly')
t.assert.strictEqual(requestCount, 1, 'Same complex query should be cached')
t.assert.strictEqual(body1, body2, 'Complex query parameters should be cached correctly')

// Slightly different query - should NOT be cached
const response3 = await request(origin, {
Expand All @@ -127,11 +126,11 @@ test('complex query parameters are handled correctly', async () => {
}
})
const body3 = await response3.body.text()
equal(requestCount, 2, 'Different complex query should hit the server')
notEqual(body1, body3, 'Different query parameters should create separate cache entries')
t.assert.strictEqual(requestCount, 2, 'Different complex query should hit the server')
t.assert.notStrictEqual(body1, body3, 'Different query parameters should create separate cache entries')
})

test('query parameters vs path equivalence', async () => {
test('query parameters vs path equivalence', async (t) => {
let requestCount = 0
const server = createServer((req, res) => {
requestCount++
Expand Down Expand Up @@ -165,18 +164,18 @@ test('query parameters vs path equivalence', async () => {
query: { foo: 'bar', baz: 'qux' }
})
const body1 = await response1.body.text()
equal(requestCount, 1, 'Query object request should hit the server')
t.assert.strictEqual(requestCount, 1, 'Query object request should hit the server')

// Request using path with query string - should be cached if URLs match
const response2 = await request(`${origin}/?foo=bar&baz=qux`, {
dispatcher: client
})
const body2 = await response2.body.text()
equal(requestCount, 1, 'Equivalent path query should be cached')
equal(body1, body2, 'Query object and path query should be equivalent')
t.assert.strictEqual(requestCount, 1, 'Equivalent path query should be cached')
t.assert.strictEqual(body1, body2, 'Query object and path query should be equivalent')
})

test('empty and undefined query parameters', async () => {
test('empty and undefined query parameters', async (t) => {
let requestCount = 0
const server = createServer((req, res) => {
requestCount++
Expand Down Expand Up @@ -207,23 +206,23 @@ test('empty and undefined query parameters', async () => {
// Request with no query
const response1 = await request(origin, { dispatcher: client })
const body1 = await response1.body.text()
equal(requestCount, 1, 'No query request should hit the server')
t.assert.strictEqual(requestCount, 1, 'No query request should hit the server')

// Request with empty query object - should be cached
const response2 = await request(origin, {
dispatcher: client,
query: {}
})
const body2 = await response2.body.text()
equal(requestCount, 1, 'Empty query object should be cached')
equal(body1, body2, 'No query and empty query should be equivalent')
t.assert.strictEqual(requestCount, 1, 'Empty query object should be cached')
t.assert.strictEqual(body1, body2, 'No query and empty query should be equivalent')

// Request with undefined query - should be cached
const response3 = await request(origin, {
dispatcher: client,
query: undefined
})
const body3 = await response3.body.text()
equal(requestCount, 1, 'Undefined query should be cached')
equal(body1, body3, 'No query and undefined query should be equivalent')
t.assert.strictEqual(requestCount, 1, 'Undefined query should be cached')
t.assert.strictEqual(body1, body3, 'No query and undefined query should be equivalent')
})
13 changes: 6 additions & 7 deletions test/interceptors/cache-revalidate-stale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
'use strict'

const { test, after } = require('node:test')
const { strictEqual } = require('node:assert')
const { createServer } = require('node:http')
const { once } = require('node:events')
const { request, Client, interceptors } = require('../../index')
const FakeTimers = require('@sinonjs/fake-timers')

test('revalidates the request when the response is stale', async () => {
test('revalidates the request when the response is stale', async (t) => {
const clock = FakeTimers.install({
now: 1
})
Expand Down Expand Up @@ -36,34 +35,34 @@ test('revalidates the request when the response is stale', async () => {

{
const res = await request(url, { dispatcher })
strictEqual(await res.body.text(), 'hello world 0')
t.assert.strictEqual(await res.body.text(), 'hello world 0')
}

clock.tick(999)

{
const res = await request(url, { dispatcher })
strictEqual(await res.body.text(), 'hello world 0')
t.assert.strictEqual(await res.body.text(), 'hello world 0')
}

clock.tick(1)

{
const res = await request(url, { dispatcher })
strictEqual(await res.body.text(), 'hello world 1')
t.assert.strictEqual(await res.body.text(), 'hello world 1')
}

clock.tick(999)

{
const res = await request(url, { dispatcher })
strictEqual(await res.body.text(), 'hello world 1')
t.assert.strictEqual(await res.body.text(), 'hello world 1')
}

clock.tick(1)

{
const res = await request(url, { dispatcher })
strictEqual(await res.body.text(), 'hello world 2')
t.assert.strictEqual(await res.body.text(), 'hello world 2')
}
})
Loading
Loading