Unverified Commit 82dc672a authored by Dima Voytenko's avatar Dima Voytenko Committed by GitHub

Disable cache in testmode (#63265)

Fixes #63127.
parent 6d45c325
...@@ -66,6 +66,7 @@ export class CacheHandler { ...@@ -66,6 +66,7 @@ export class CacheHandler {
export class IncrementalCache implements IncrementalCacheType { export class IncrementalCache implements IncrementalCacheType {
dev?: boolean dev?: boolean
disableForTestmode?: boolean
cacheHandler?: CacheHandler cacheHandler?: CacheHandler
hasCustomCacheHandler: boolean hasCustomCacheHandler: boolean
prerenderManifest: PrerenderManifest prerenderManifest: PrerenderManifest
...@@ -142,6 +143,7 @@ export class IncrementalCache implements IncrementalCacheType { ...@@ -142,6 +143,7 @@ export class IncrementalCache implements IncrementalCacheType {
maxMemoryCacheSize = parseInt(process.env.__NEXT_TEST_MAX_ISR_CACHE, 10) maxMemoryCacheSize = parseInt(process.env.__NEXT_TEST_MAX_ISR_CACHE, 10)
} }
this.dev = dev this.dev = dev
this.disableForTestmode = process.env.NEXT_PRIVATE_TEST_PROXY === 'true'
// this is a hack to avoid Webpack knowing this is equal to this.minimalMode // this is a hack to avoid Webpack knowing this is equal to this.minimalMode
// because we replace this.minimalMode to true in production bundles. // because we replace this.minimalMode to true in production bundles.
const minimalModeKey = 'minimalMode' const minimalModeKey = 'minimalMode'
...@@ -441,9 +443,10 @@ export class IncrementalCache implements IncrementalCacheType { ...@@ -441,9 +443,10 @@ export class IncrementalCache implements IncrementalCacheType {
// we don't leverage the prerender cache in dev mode // we don't leverage the prerender cache in dev mode
// so that getStaticProps is always called for easier debugging // so that getStaticProps is always called for easier debugging
if ( if (
this.dev && this.disableForTestmode ||
(ctx.kindHint !== 'fetch' || (this.dev &&
this.requestHeaders['cache-control'] === 'no-cache') (ctx.kindHint !== 'fetch' ||
this.requestHeaders['cache-control'] === 'no-cache'))
) { ) {
return null return null
} }
...@@ -560,7 +563,7 @@ export class IncrementalCache implements IncrementalCacheType { ...@@ -560,7 +563,7 @@ export class IncrementalCache implements IncrementalCacheType {
}) })
} }
if (this.dev && !ctx.fetchCache) return if (this.disableForTestmode || (this.dev && !ctx.fetchCache)) return
// FetchCache has upper limit of 2MB per-entry currently // FetchCache has upper limit of 2MB per-entry currently
const itemSize = JSON.stringify(data).length const itemSize = JSON.stringify(data).length
if ( if (
......
...@@ -38,11 +38,11 @@ createNextDescribe( ...@@ -38,11 +38,11 @@ createNextDescribe(
proxyServer.close() proxyServer.close()
}) })
const fetchForTest = async (url: string) => { const fetchForTest = async (url: string, testData?: string) => {
return next.fetch(url, { return next.fetch(url, {
headers: { headers: {
'Next-Test-Proxy-Port': String(proxyServer.port), 'Next-Test-Proxy-Port': String(proxyServer.port),
'Next-Test-Data': 'test1', 'Next-Test-Data': testData ?? 'test1',
}, },
}) })
} }
...@@ -53,6 +53,16 @@ createNextDescribe( ...@@ -53,6 +53,16 @@ createNextDescribe(
expect(html).toContain('<pre>test1</pre>') expect(html).toContain('<pre>test1</pre>')
}) })
it('should avoid fetch cache', async () => {
const html1 = await (await fetchForTest('/app/rsc-fetch')).text()
expect(html1).toContain('<pre>test1</pre>')
const html2 = await (
await fetchForTest('/app/rsc-fetch', 'test2')
).text()
expect(html2).toContain('<pre>test2</pre>')
})
it('should handle RSC with http.get in serverless function', async () => { it('should handle RSC with http.get in serverless function', async () => {
const html = await (await fetchForTest('/app/rsc-httpget')).text() const html = await (await fetchForTest('/app/rsc-httpget')).text()
expect(html).toContain('<pre>test1</pre>') expect(html).toContain('<pre>test1</pre>')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment