Merge branch 'canary' into sam/github-workflow/bankrupt

vercel · Jun 11, 2024 · 72d5706 · 72d5706
2 parents a31609b + 0c49daa
commit 72d5706
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 50 deletions.
diff --git a/test/deploy-tests-manifest.json b/test/deploy-tests-manifest.json
@@ -7,7 +7,6 @@
       "test/production/**/*.test.{t,j}s{,x}"
     ],
     "exclude": [
-      "test/e2e/app-dir/app-client-cache/client-cache.original.test.ts",
       "test/e2e/app-dir/app-routes/app-custom-routes.test.ts",
       "test/e2e/app-dir/next-after-app/index.test.ts",
       "test/e2e/app-dir/scss/nm-module-nested/nm-module-nested.test.ts",
@@ -32,7 +31,6 @@
       "test/e2e/third-parties/index.test.ts",
       "test/e2e/useselectedlayoutsegment-s-in-pages-router/useselectedlayoutsegment-s-in-pages-router.test.ts",
       "test/e2e/app-dir/app-prefetch-false-loading/app-prefetch-false-loading.test.ts",
-      "test/e2e/app-dir/app-client-cache/client-cache.experimental.test.ts",
       "test/e2e/app-dir/app-routes-client-component/app-routes-client-component.test.ts",
       "test/e2e/app-dir/app-routes/app-custom-route-base-path.test.ts",
       "test/e2e/app-dir/mdx/mdx.test.ts",

diff --git a/test/e2e/app-dir/app-client-cache/client-cache.defaults.test.ts b/test/e2e/app-dir/app-client-cache/client-cache.defaults.test.ts
@@ -1,5 +1,5 @@
 import { nextTestSetup } from 'e2e-utils'
-import { check } from 'next-test-utils'
+import { check, retry } from 'next-test-utils'
 import { BrowserInterface } from 'next-webdriver'
 import {
   browserConfigWithFixedTime,
@@ -316,18 +316,20 @@ describe('app dir client cache semantics (default semantics)', () => {
         await browser.elementByCss('[href="/null-loading"]').click()
 
         // the page content should disappear immediately
-        expect(
-          await browser.hasElementByCssSelector('[href="/null-loading"]')
-        ).toBeFalse()
+        await retry(async () => {
+          expect(
+            await browser.hasElementByCssSelector('[href="/null-loading"]')
+          ).toBe(false)
+        })
 
         // the root layout should still be visible
-        expect(await browser.hasElementByCssSelector('#root-layout')).toBeTrue()
+        expect(await browser.hasElementByCssSelector('#root-layout')).toBe(true)
 
         // the dynamic content should eventually appear
         await browser.waitForElementByCss('#random-number')
-        expect(
-          await browser.hasElementByCssSelector('#random-number')
-        ).toBeTrue()
+        expect(await browser.hasElementByCssSelector('#random-number')).toBe(
+          true
+        )
       })
     })
 

diff --git a/test/e2e/app-dir/app-client-cache/client-cache.experimental.test.ts b/test/e2e/app-dir/app-client-cache/client-cache.experimental.test.ts
@@ -5,7 +5,7 @@ import path from 'path'
 
 describe('app dir client cache semantics (experimental staleTimes)', () => {
   describe('dynamic: 0', () => {
-    const { next, isNextDev } = nextTestSetup({
+    const { next, isNextDev, isNextDeploy } = nextTestSetup({
       files: path.join(__dirname, 'fixtures', 'regular'),
       nextConfig: {
         experimental: { staleTimes: { dynamic: 0 } },
@@ -222,27 +222,29 @@ describe('app dir client cache semantics (experimental staleTimes)', () => {
       })
     })
 
-    describe('telemetry', () => {
-      it('should send staleTimes feature usage event', async () => {
-        const events = findAllTelemetryEvents(
-          next.cliOutput,
-          'NEXT_CLI_SESSION_STARTED'
-        )
+    if (!isNextDeploy) {
+      describe('telemetry', () => {
+        it('should send staleTimes feature usage event', async () => {
+          const events = findAllTelemetryEvents(
+            next.cliOutput,
+            'NEXT_CLI_SESSION_STARTED'
+          )
 
-        expect(events).toEqual(
-          expect.arrayContaining([
-            expect.objectContaining({
-              staticStaleTime: null,
-              dynamicStaleTime: 0,
-            }),
-          ])
-        )
+          expect(events).toEqual(
+            expect.arrayContaining([
+              expect.objectContaining({
+                staticStaleTime: null,
+                dynamicStaleTime: 0,
+              }),
+            ])
+          )
+        })
       })
-    })
+    }
   })
 
   describe('static: 180', () => {
-    const { next, isNextDev } = nextTestSetup({
+    const { next, isNextDev, isNextDeploy } = nextTestSetup({
       files: path.join(__dirname, 'fixtures', 'regular'),
       nextConfig: {
         experimental: { staleTimes: { static: 180 } },
@@ -341,22 +343,24 @@ describe('app dir client cache semantics (experimental staleTimes)', () => {
       })
     })
 
-    describe('telemetry', () => {
-      it('should send staleTimes feature usage event', async () => {
-        const events = findAllTelemetryEvents(
-          next.cliOutput,
-          'NEXT_CLI_SESSION_STARTED'
-        )
-        expect(events).toEqual(
-          expect.arrayContaining([
-            expect.objectContaining({
-              staticStaleTime: 180,
-              dynamicStaleTime: null,
-            }),
-          ])
-        )
+    if (!isNextDeploy) {
+      describe('telemetry', () => {
+        it('should send staleTimes feature usage event', async () => {
+          const events = findAllTelemetryEvents(
+            next.cliOutput,
+            'NEXT_CLI_SESSION_STARTED'
+          )
+          expect(events).toEqual(
+            expect.arrayContaining([
+              expect.objectContaining({
+                staticStaleTime: 180,
+                dynamicStaleTime: null,
+              }),
+            ])
+          )
+        })
       })
-    })
+    }
   })
 
   describe('dynamic: 0, static: 0', () => {

diff --git a/test/e2e/app-dir/app-client-cache/client-cache.original.test.ts b/test/e2e/app-dir/app-client-cache/client-cache.original.test.ts
@@ -1,5 +1,5 @@
 import { nextTestSetup } from 'e2e-utils'
-import { check } from 'next-test-utils'
+import { check, retry } from 'next-test-utils'
 import { BrowserInterface } from 'next-webdriver'
 import {
   browserConfigWithFixedTime,
@@ -421,18 +421,20 @@ describe('app dir client cache semantics (30s/5min)', () => {
         await browser.elementByCss('[href="/null-loading"]').click()
 
         // the page content should disappear immediately
-        expect(
-          await browser.hasElementByCssSelector('[href="/null-loading"]')
-        ).toBeFalse()
+        await retry(async () => {
+          expect(
+            await browser.hasElementByCssSelector('[href="/null-loading"]')
+          ).toBe(false)
+        })
 
         // the root layout should still be visible
-        expect(await browser.hasElementByCssSelector('#root-layout')).toBeTrue()
+        expect(await browser.hasElementByCssSelector('#root-layout')).toBe(true)
 
         // the dynamic content should eventually appear
         await browser.waitForElementByCss('#random-number')
-        expect(
-          await browser.hasElementByCssSelector('#random-number')
-        ).toBeTrue()
+        expect(await browser.hasElementByCssSelector('#random-number')).toBe(
+          true
+        )
       })
     })