test: move test to dedicated fixture

Author: pieh

tests/e2e/after.test.ts

@@ -0,0 +1,42 @@
+import { expect } from '@playwright/test'
+import { nextVersionSatisfies } from '../utils/next-version-helpers.mjs'
+import { test } from '../utils/playwright-helpers.js'
+
+test('next/after callback is executed and finishes', async ({ page, after }) => {
+  test.skip(!nextVersionSatisfies('>=15.0.0'), 'This test is only for Next.js 15+')
+
+  // trigger initial request to check page which might be stale and allow regenerating in background
+  await page.goto(`${after.url}/after/check`)
+
+  await new Promise((resolve) => setTimeout(resolve, 5000))
+
+  // after it was possibly regenerated we can start checking actual content of the page
+  await page.goto(`${after.url}/after/check`)
+  const pageInfoLocator1 = await page.locator('#page-info')
+  const pageInfo1 = JSON.parse((await pageInfoLocator1.textContent()) ?? '{}')
+
+  expect(typeof pageInfo1?.timestamp, 'Check page should have timestamp').toBe('number')
+
+  await page.goto(`${after.url}/after/check`)
+  const pageInfoLocator2 = await page.locator('#page-info')
+  const pageInfo2 = JSON.parse((await pageInfoLocator2.textContent()) ?? '{}')
+
+  expect(typeof pageInfo2?.timestamp, 'Check page should have timestamp').toBe('number')
+
+  expect(pageInfo2.timestamp, 'Check page should be cached').toBe(pageInfo1.timestamp)
+
+  await page.goto(`${after.url}/after/trigger`)
+
+  // wait for next/after to trigger revalidation of check page
+  await new Promise((resolve) => setTimeout(resolve, 5000))
+
+  await page.goto(`${after.url}/after/check`)
+  const pageInfoLocator3 = await page.locator('#page-info')
+  const pageInfo3 = JSON.parse((await pageInfoLocator3.textContent()) ?? '{}')
+
+  expect(typeof pageInfo3?.timestamp, 'Check page should have timestamp').toBe('number')
+  expect(
+    pageInfo3.timestamp,
+    'Check page should be invalidated with newer timestamp',
+  ).toBeGreaterThan(pageInfo1.timestamp)
+})

tests/e2e/simple-app.test.ts

@@ -272,42 +272,3 @@ test('can require CJS module that is not bundled', async ({ simple }) => {
   expect(parsedBody.notBundledCJSModule.isBundled).toEqual(false)
   expect(parsedBody.bundledCJSModule.isBundled).toEqual(true)
 })
-
-test('next/after callback is executed and finishes', async ({ page, simple }) => {
-  test.skip(!nextVersionSatisfies('>=15.0.0'), 'This test is only for Next.js 15+')
-
-  // trigger initial request to check page which might be stale and allow regenerating in background
-  await page.goto(`${simple.url}/after/check`)
-
-  await new Promise((resolve) => setTimeout(resolve, 5000))
-
-  // after it was possibly regenerated we can start checking actual content of the page
-  await page.goto(`${simple.url}/after/check`)
-  const pageInfoLocator1 = await page.locator('#page-info')
-  const pageInfo1 = JSON.parse((await pageInfoLocator1.textContent()) ?? '{}')
-
-  expect(typeof pageInfo1?.timestamp, 'Check page should have timestamp').toBe('number')
-
-  await page.goto(`${simple.url}/after/check`)
-  const pageInfoLocator2 = await page.locator('#page-info')
-  const pageInfo2 = JSON.parse((await pageInfoLocator2.textContent()) ?? '{}')
-
-  expect(typeof pageInfo2?.timestamp, 'Check page should have timestamp').toBe('number')
-
-  expect(pageInfo2.timestamp, 'Check page should be cached').toBe(pageInfo1.timestamp)
-
-  await page.goto(`${simple.url}/after/trigger`)
-
-  // wait for next/after to trigger revalidation of check page
-  await new Promise((resolve) => setTimeout(resolve, 5000))
-
-  await page.goto(`${simple.url}/after/check`)
-  const pageInfoLocator3 = await page.locator('#page-info')
-  const pageInfo3 = JSON.parse((await pageInfoLocator3.textContent()) ?? '{}')
-
-  expect(typeof pageInfo3?.timestamp, 'Check page should have timestamp').toBe('number')
-  expect(
-    pageInfo3.timestamp,
-    'Check page should be invalidated with newer timestamp',
-  ).toBeGreaterThan(pageInfo1.timestamp)
-})

tests/fixtures/simple/app/after/check/page.js renamed to tests/fixtures/after/app/after/check/page.js

@@ -0,0 +1,12 @@
+export const metadata = {
+  title: 'Simple Next App',
+  description: 'Description for Simple Next App',
+}
+
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}

tests/fixtures/simple/app/after/trigger/page.js renamed to tests/fixtures/after/app/after/trigger/page.js

@@ -0,0 +1,12 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  output: 'standalone',
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+  experimental: {
+    after: true,
+  },
+}
+
+module.exports = nextConfig

tests/fixtures/after/app/layout.js

@@ -0,0 +1,20 @@
+{
+  "name": "after",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "postinstall": "next build",
+    "dev": "next dev",
+    "build": "next build"
+  },
+  "dependencies": {
+    "next": "latest",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
+  },
+  "test": {
+    "dependencies": {
+      "next": ">=15.0.0"
+    }
+  }
+}

tests/fixtures/after/next.config.js

@@ -8,7 +8,6 @@ const nextConfig = {
     outputFileTracingIncludes: {
       '/': ['public/**'],
     },
-    after: true,
   },
   images: {
     remotePatterns: [

tests/fixtures/after/package.json

@@ -58,7 +58,6 @@ test<FixtureTestContext>('Test that the simple next app is working', async (ctx)
   const blobEntries = await getBlobEntries(ctx)
   expect(blobEntries.map(({ key }) => decodeBlobKey(key)).sort()).toEqual([
     '/404',
-    '/after/check',
     '/api/cached-permanent',
     '/api/cached-revalidate',
     '/image/local',

tests/fixtures/simple/next.config.js

@@ -428,4 +428,5 @@ export const fixtureFactories = {
       publishDirectory: 'apps/site/.next',
       smoke: true,
     }),
+  after: () => createE2EFixture('after'),
 }