From 90dc72a5a68e904800cdc7a7a3ef545a84f2646b Mon Sep 17 00:00:00 2001
From: SukkaW <isukkaw@gmail.com>
Date: Thu, 18 Aug 2022 20:07:34 +0800
Subject: [PATCH] test(#39609): move from e2e to intergration

---
 test/e2e/dynamic-with-suspense/index.test.ts  | 61 -------------------
 .../next-dynamic-with-suspense/pages/index.js | 19 ++++++
 .../next-dynamic-with-suspense/pages/thing.js |  3 +
 .../test/index.test.ts                        | 41 +++++++++++++
 4 files changed, 63 insertions(+), 61 deletions(-)
 delete mode 100644 test/e2e/dynamic-with-suspense/index.test.ts
 create mode 100644 test/integration/next-dynamic-with-suspense/pages/index.js
 create mode 100644 test/integration/next-dynamic-with-suspense/pages/thing.js
 create mode 100644 test/integration/next-dynamic-with-suspense/test/index.test.ts

diff --git a/test/e2e/dynamic-with-suspense/index.test.ts b/test/e2e/dynamic-with-suspense/index.test.ts
deleted file mode 100644
index 824d3785ea92..000000000000
--- a/test/e2e/dynamic-with-suspense/index.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { createNext } from 'e2e-utils'
-import { NextInstance } from 'test/lib/next-modes/base'
-import { hasRedbox, renderViaHTTP } from 'next-test-utils'
-import webdriver from 'next-webdriver'
-
-const suite =
-  process.env.NEXT_TEST_REACT_VERSION === '^17' ? describe.skip : describe
-
-// Skip the suspense test if react version is 17
-suite('dynamic with suspense', () => {
-  let next: NextInstance
-
-  beforeAll(async () => {
-    next = await createNext({
-      files: {
-        'pages/index.js': `
-          import { Suspense } from "react";
-          import dynamic from "next/dynamic";
-          
-          const Thing = dynamic(() => import("./thing"), { ssr: false, suspense: true });
-          
-          export default function IndexPage() {
-            return (
-              <div>
-                <p>Next.js Example</p>
-                <Suspense fallback="Loading...">
-                  <Thing />
-                </Suspense>
-              </div>
-            );
-          }
-        `,
-        'pages/thing.js': `
-          export default function Thing() {
-            return "Thing";
-          }
-        `,
-      },
-      dependencies: {},
-    })
-  })
-  afterAll(() => next.destroy())
-
-  it('should render server-side', async () => {
-    const html = await renderViaHTTP(next.url, '/')
-    expect(html).toContain('Next.js Example')
-    expect(html).toContain('Thing')
-  })
-
-  it('should render client-side', async () => {
-    const browser = await webdriver(next.url, '/')
-    const warnings = (await browser.log()).map((log) => log.message).join('\n')
-
-    expect(await hasRedbox(browser)).toBe(false)
-    expect(warnings).toMatch(
-      /"ssr: false" is ignored by next\/dynamic because you can not enable "suspense" while disabling "ssr" at the same time/gim
-    )
-
-    await browser.close()
-  })
-})
diff --git a/test/integration/next-dynamic-with-suspense/pages/index.js b/test/integration/next-dynamic-with-suspense/pages/index.js
new file mode 100644
index 000000000000..284fcc7f7f8f
--- /dev/null
+++ b/test/integration/next-dynamic-with-suspense/pages/index.js
@@ -0,0 +1,19 @@
+import { Suspense } from 'react'
+import dynamic from 'next/dynamic'
+
+const Thing = dynamic(() => import('./thing'), {
+  ssr: false,
+  suspense: true,
+  loading: () => 'Loading...',
+})
+
+export default function IndexPage() {
+  return (
+    <div>
+      <p>Next.js Example</p>
+      <Suspense fallback="Loading...">
+        <Thing />
+      </Suspense>
+    </div>
+  )
+}
diff --git a/test/integration/next-dynamic-with-suspense/pages/thing.js b/test/integration/next-dynamic-with-suspense/pages/thing.js
new file mode 100644
index 000000000000..561df9831e5b
--- /dev/null
+++ b/test/integration/next-dynamic-with-suspense/pages/thing.js
@@ -0,0 +1,3 @@
+export default function Thing() {
+  return 'Thing'
+}
diff --git a/test/integration/next-dynamic-with-suspense/test/index.test.ts b/test/integration/next-dynamic-with-suspense/test/index.test.ts
new file mode 100644
index 000000000000..625fdde999d5
--- /dev/null
+++ b/test/integration/next-dynamic-with-suspense/test/index.test.ts
@@ -0,0 +1,41 @@
+/* eslint-env jest */
+
+import webdriver from 'next-webdriver'
+import { join } from 'path'
+import {
+  renderViaHTTP,
+  findPort,
+  launchApp,
+  killApp,
+  hasRedbox,
+} from 'next-test-utils'
+
+let app
+let appPort: number
+const appDir = join(__dirname, '../')
+
+describe('next/dynamic with suspense', () => {
+  beforeAll(async () => {
+    appPort = await findPort()
+    app = await launchApp(appDir, appPort)
+  })
+  afterAll(() => killApp(app))
+
+  it('should render server-side', async () => {
+    const html = await renderViaHTTP(appPort, '/')
+    expect(html).toContain('Next.js Example')
+    expect(html).toContain('Thing')
+  })
+
+  it('should render client-side', async () => {
+    const browser = await webdriver(appPort, '/')
+    const warnings = (await browser.log()).map((log) => log.message).join('\n')
+
+    expect(await hasRedbox(browser)).toBe(false)
+    expect(warnings).toMatch(
+      /"ssr: false" is ignored by next\/dynamic because you can not enable "suspense" while disabling "ssr" at the same time/gim
+    )
+
+    await browser.close()
+  })
+})