From 08ef1db12d67adae8e5b71ed98cd0e13d0b89687 Mon Sep 17 00:00:00 2001
From: Zack Tanner <1939140+ztanner@users.noreply.github.com>
Date: Thu, 19 Sep 2024 13:03:57 -0700
Subject: [PATCH] unskip middleware deploy test

---
 .../app-middleware/app-middleware.test.ts     | 33 +++++++------------
 .../app/rsc-cookies/cookie-options/page.js    | 14 +++-----
 .../app-middleware/app/rsc-cookies/form.js    | 16 +++++++++
 .../app-middleware/app/rsc-cookies/page.js    | 16 +++------
 4 files changed, 36 insertions(+), 43 deletions(-)
 create mode 100644 test/e2e/app-dir/app-middleware/app/rsc-cookies/form.js

diff --git a/test/e2e/app-dir/app-middleware/app-middleware.test.ts b/test/e2e/app-dir/app-middleware/app-middleware.test.ts
index ce7ee3be3a356..4ac59e10c4f3a 100644
--- a/test/e2e/app-dir/app-middleware/app-middleware.test.ts
+++ b/test/e2e/app-dir/app-middleware/app-middleware.test.ts
@@ -6,15 +6,10 @@ import { nextTestSetup, FileRef } from 'e2e-utils'
 import type { Response } from 'node-fetch'
 
 describe('app-dir with middleware', () => {
-  const { next, skipped } = nextTestSetup({
+  const { next } = nextTestSetup({
     files: __dirname,
-    skipDeployment: true,
   })
 
-  if (skipped) {
-    return
-  }
-
   it('should filter correctly after middleware rewrite', async () => {
     const browser = await next.browser('/start')
 
@@ -179,8 +174,10 @@ describe('app-dir with middleware', () => {
 
     await browser.elementById('submit-server-action').click()
 
-    await retry(() => {
-      expect(next.cliOutput).toMatch(/\[Cookie From Action\]: \d+\.\d+/)
+    await retry(async () => {
+      expect(await browser.elementById('action-result').text()).toMatch(
+        /Action Result: \d+\.\d+/
+      )
     })
 
     // ensure that we still can't read the secure cookie
@@ -210,8 +207,10 @@ describe('app-dir with middleware', () => {
 
     await browser.elementById('submit-server-action').click()
 
-    await retry(() => {
-      expect(next.cliOutput).toMatch(/\[Cookie From Action\]: \d+\.\d+/)
+    await retry(async () => {
+      expect(await browser.elementById('action-result').text()).toMatch(
+        /Action Result: \d+\.\d+/
+      )
     })
 
     await browser.deleteCookies()
@@ -219,7 +218,7 @@ describe('app-dir with middleware', () => {
 })
 
 describe('app dir - middleware without pages dir', () => {
-  const { next, skipped } = nextTestSetup({
+  const { next } = nextTestSetup({
     files: {
       app: new FileRef(path.join(__dirname, 'app')),
       'next.config.js': new FileRef(path.join(__dirname, 'next.config.js')),
@@ -235,13 +234,8 @@ describe('app dir - middleware without pages dir', () => {
       }
     `,
     },
-    skipDeployment: true,
   })
 
-  if (skipped) {
-    return
-  }
-
   // eslint-disable-next-line jest/no-identical-title
   it('Updates headers', async () => {
     const html = await next.render('/headers')
@@ -251,7 +245,7 @@ describe('app dir - middleware without pages dir', () => {
 })
 
 describe('app dir - middleware with middleware in src dir', () => {
-  const { next, skipped } = nextTestSetup({
+  const { next } = nextTestSetup({
     files: {
       'src/app': new FileRef(path.join(__dirname, 'app')),
       'next.config.js': new FileRef(path.join(__dirname, 'next.config.js')),
@@ -265,13 +259,8 @@ describe('app dir - middleware with middleware in src dir', () => {
       }
     `,
     },
-    skipDeployment: true,
   })
 
-  if (skipped) {
-    return
-  }
-
   it('works without crashing when using requestAsyncStorage', async () => {
     const browser = await next.browser('/')
     await browser.addCookie({
diff --git a/test/e2e/app-dir/app-middleware/app/rsc-cookies/cookie-options/page.js b/test/e2e/app-dir/app-middleware/app/rsc-cookies/cookie-options/page.js
index 569bcb8bd625b..91e90bc09542a 100644
--- a/test/e2e/app-dir/app-middleware/app/rsc-cookies/cookie-options/page.js
+++ b/test/e2e/app-dir/app-middleware/app/rsc-cookies/cookie-options/page.js
@@ -1,5 +1,6 @@
 import { cookies } from 'next/headers'
 import Link from 'next/link'
+import { Form } from '../form'
 
 export default function Page() {
   return (
@@ -7,19 +8,12 @@ export default function Page() {
       <p id="total-cookies">Total Cookie Length: {cookies().size}</p>
       <Link href="/rsc-cookies-delete">To Delete Cookies Route</Link>
 
-      <form
+      <Form
         action={async () => {
           'use server'
-          console.log(
-            '[Cookie From Action]:',
-            cookies().get('rsc-secure-cookie').value
-          )
+          return cookies().get('rsc-secure-cookie').value
         }}
-      >
-        <button type="submit" id="submit-server-action">
-          server action
-        </button>
-      </form>
+      />
     </div>
   )
 }
diff --git a/test/e2e/app-dir/app-middleware/app/rsc-cookies/form.js b/test/e2e/app-dir/app-middleware/app/rsc-cookies/form.js
new file mode 100644
index 0000000000000..638f30b338964
--- /dev/null
+++ b/test/e2e/app-dir/app-middleware/app/rsc-cookies/form.js
@@ -0,0 +1,16 @@
+'use client'
+
+import { useActionState } from 'react'
+
+export function Form({ action }) {
+  const [state, formAction] = useActionState(action, null)
+
+  return (
+    <form action={formAction}>
+      <div id="action-result">Action Result: {state}</div>
+      <button type="submit" id="submit-server-action">
+        server action
+      </button>
+    </form>
+  )
+}
diff --git a/test/e2e/app-dir/app-middleware/app/rsc-cookies/page.js b/test/e2e/app-dir/app-middleware/app/rsc-cookies/page.js
index b75a70bac6b0b..cdf83dc497acc 100644
--- a/test/e2e/app-dir/app-middleware/app/rsc-cookies/page.js
+++ b/test/e2e/app-dir/app-middleware/app/rsc-cookies/page.js
@@ -1,5 +1,6 @@
 import { cookies } from 'next/headers'
 import Link from 'next/link'
+import { Form } from './form'
 
 export default function Page() {
   const rscCookie1 = cookies().get('rsc-cookie-value-1')?.value
@@ -11,20 +12,13 @@ export default function Page() {
       <p id="rsc-cookie-2">Cookie 2: {rscCookie2}</p>
       <p id="total-cookies">Total Cookie Length: {cookies().size}</p>
       <Link href="/rsc-cookies-delete">To Delete Cookies Route</Link>
-
-      <form
+      <Form
         action={async () => {
           'use server'
-          console.log(
-            '[Cookie From Action]:',
-            cookies().get('rsc-cookie-value-1').value
-          )
+
+          return cookies().get('rsc-cookie-value-1')?.value
         }}
-      >
-        <button type="submit" id="submit-server-action">
-          server action
-        </button>
-      </form>
+      />
     </div>
   )
 }