test: update 404 caching tests

Author: orinokai

tests/fixtures/page-router/pages/404.js

@@ -0,0 +1,3 @@
+export default function NotFound() {
+  return <p>Custom 404 page</p>
+}

tests/fixtures/page-router/pages/products/[slug].js

@@ -9,6 +9,13 @@ const Product = ({ time, slug }) => (
 )
 
 export async function getStaticProps({ params }) {
+  if (params.slug === 'not-found-with-revalidate') {
+    return {
+      notFound: true,
+      revalidate: 600,
+    }
+  }
+
   return {
     props: {
       time: new Date().toISOString(),

tests/integration/page-router.test.ts

@@ -154,51 +154,59 @@ test<FixtureTestContext>('Should serve correct locale-aware custom 404 pages', a
   ).toBe('fr')
 })
 
-describe('404 caching', () => {
-  describe('default nextjs 404 (no custom 404)', () => {
-    test.todo<FixtureTestContext>('not matching dynamic paths')
-    test.todo<FixtureTestContext>('matching dynamic path without revalidate')
-    test.todo<FixtureTestContext>('matching dynamic path with revalidate')
-  })
-
+describe.only('404 caching', () => {
   describe('404 without getStaticProps', () => {
-    test.todo<FixtureTestContext>('not matching dynamic paths')
-    test.todo<FixtureTestContext>('matching dynamic path without revalidate')
-    test.todo<FixtureTestContext>('matching dynamic path with revalidate')
-  })
-
-  describe('404 with getStaticProps without revalidate', () => {
     test<FixtureTestContext>('not matching dynamic paths should be cached permanently', async (ctx) => {
-      console.log('[test] not matching dynamic paths')
+      await createFixture('page-router', ctx)
+      await runPlugin(ctx)
 
-      await createFixture('page-router-base-path-i18n', ctx)
+      const notExistingPage = await invokeFunction(ctx, {
+        url: '/not-existing-page',
+      })
+
+      expect(notExistingPage.statusCode).toBe(404)
+
+      expect(
+        notExistingPage.headers['netlify-cdn-cache-control'],
+        'should be cached permanently',
+      ).toBe('s-maxage=31536000, stale-while-revalidate=31536000, durable')
+    })
+    test<FixtureTestContext>('matching dynamic path with revalidate should be cached permanently', async (ctx) => {
+      await createFixture('page-router', ctx)
       await runPlugin(ctx)
 
       const notExistingPage = await invokeFunction(ctx, {
-        url: '/base/path/not-existing-page',
+        url: '/products/not-found-with-revalidate',
       })
 
+      expect(notExistingPage.statusCode).toBe(404)
+
       expect(
         notExistingPage.headers['netlify-cdn-cache-control'],
         'should be cached permanently',
       ).toBe('s-maxage=31536000, stale-while-revalidate=31536000, durable')
     })
-    test<FixtureTestContext>('matching dynamic path without revalidate should be cached permanently', async (ctx) => {
-      console.log('[test] matching dynamic path without revalidate')
+  })
+
+  describe('404 with getStaticProps without revalidate', () => {
+    test<FixtureTestContext>('not matching dynamic paths should be cached permanently', async (ctx) => {
+      console.log('[test] not matching dynamic paths')
 
       await createFixture('page-router-base-path-i18n', ctx)
       await runPlugin(ctx)
 
       const notExistingPage = await invokeFunction(ctx, {
-        url: '/base/path/products/not-found-no-revalidate',
+        url: '/base/path/not-existing-page',
       })
 
+      expect(notExistingPage.statusCode).toBe(404)
+
       expect(
         notExistingPage.headers['netlify-cdn-cache-control'],
         'should be cached permanently',
       ).toBe('s-maxage=31536000, stale-while-revalidate=31536000, durable')
     })
-    test<FixtureTestContext>('matching dynamic path with revalidate should be cached for revalidate time', async (ctx) => {
+    test<FixtureTestContext>('matching dynamic path with revalidate should be cached permanently', async (ctx) => {
       console.log('[test] matching dynamic path with revalidate')
 
       await createFixture('page-router-base-path-i18n', ctx)
@@ -209,80 +217,60 @@ describe('404 caching', () => {
       })
 
       expect(notExistingPage.statusCode).toBe(404)
-      // this page was not prerendered, so no STALE case here
+
       expect(
         notExistingPage.headers['netlify-cdn-cache-control'],
-        'should be cached for 600 seconds',
-      ).toBe('s-maxage=600, stale-while-revalidate=31536000, durable')
+        'should be cached permanently',
+      ).toBe('s-maxage=31536000, stale-while-revalidate=31536000, durable')
     })
   })
 
   describe('404 with getStaticProps with revalidate', () => {
     test<FixtureTestContext>('not matching dynamic paths should be cached for 404 page revalidate', async (ctx) => {
-      console.log('[test] not matching dynamic paths')
-
       await createFixture('page-router-404-get-static-props-with-revalidate', ctx)
       await runPlugin(ctx)
 
       // ignoring initial stale case
       await invokeFunction(ctx, {
         url: 'not-existing-page',
       })
+
       await new Promise((res) => setTimeout(res, 100))
 
       const notExistingPage = await invokeFunction(ctx, {
         url: 'not-existing-page',
       })
 
-      expect(
-        notExistingPage.headers['netlify-cdn-cache-control'],
-        'should be cached permanently',
-      ).toBe('s-maxage=300, stale-while-revalidate=31536000, durable')
-    })
-    test.only<FixtureTestContext>('matching dynamic path without revalidate should be cached permanently', async (ctx) => {
-      console.log('[test] matching dynamic path without revalidate')
-
-      await createFixture('page-router-404-get-static-props-with-revalidate', ctx)
-      await runPlugin(ctx)
-
-      // // ignoring initial stale case
-      // await invokeFunction(ctx, {
-      //   url: 'products/not-found-no-revalidate',
-      // })
-      // await new Promise((res) => setTimeout(res, 100))
-
-      const notExistingPage = await invokeFunction(ctx, {
-        url: 'products/not-found-no-revalidate',
-      })
+      expect(notExistingPage.statusCode).toBe(404)
 
       expect(
         notExistingPage.headers['netlify-cdn-cache-control'],
-        'should be cached permanently',
-      ).toBe('s-maxage=31536000, durable')
+        'should be cached for 404 page revalidate',
+      ).toBe('s-maxage=300, stale-while-revalidate=31536000, durable')
     })
 
-    test.only<FixtureTestContext>('matching dynamic path with revalidate should be cached for revalidate time', async (ctx) => {
+    test<FixtureTestContext>('matching dynamic path with revalidate should be cached for 404 page revalidate', async (ctx) => {
       console.log('[test] matching dynamic path with revalidate')
 
       await createFixture('page-router-404-get-static-props-with-revalidate', ctx)
       await runPlugin(ctx)
 
-      // // ignoring initial stale case
-      // await invokeFunction(ctx, {
-      //   url: 'products/not-found-with-revalidate',
-      // })
-      // await new Promise((res) => setTimeout(res, 100))
+      // ignoring initial stale case
+      await invokeFunction(ctx, {
+        url: 'products/not-found-with-revalidate',
+      })
+      await new Promise((res) => setTimeout(res, 100))
 
       const notExistingPage = await invokeFunction(ctx, {
         url: 'products/not-found-with-revalidate',
       })
 
       expect(notExistingPage.statusCode).toBe(404)
-      // this page was not prerendered, so no STALE case here
+
       expect(
         notExistingPage.headers['netlify-cdn-cache-control'],
-        'should be cached for 600 seconds',
-      ).toBe('s-maxage=600, stale-while-revalidate=31535400, durable')
+        'should be cached for 404 page revalidate',
+      ).toBe('s-maxage=300, stale-while-revalidate=31536000, durable')
     })
   })
 })