chore: Fix multitenant test

Author: franky47

packages/e2e/next/cypress/e2e/multitenant.cy.ts

@@ -1,32 +1,32 @@
 import { createTest, type TestConfig } from 'e2e-shared/create-test'
-import { getShallowUrl } from 'e2e-shared/specs/shallow.defs'
+import { getOptionsUrl } from 'e2e-shared/lib/options'
 
-function testMultiTenant(options: TestConfig) {
+function testMultiTenant(
+  options: TestConfig & {
+    expectedPathname: string
+  }
+) {
   const factory = createTest('Multitenant', ({ path }) => {
     for (const shallow of [true, false]) {
       for (const history of ['replace', 'push'] as const) {
         it(`Updates with ({ shallow: ${shallow}, history: ${history} })`, () => {
-          cy.visit(getShallowUrl(path, { shallow, history }))
+          cy.visit(getOptionsUrl(path, { shallow, history }))
           cy.contains('#hydration-marker', 'hydrated').should('be.hidden')
           cy.get('#client-state').should('be.empty')
           cy.get('#server-state').should('be.empty')
           cy.get('#client-tenant').should('have.text', 'david')
           cy.get('#server-tenant').should('have.text', 'david')
           cy.get('#router-pathname').should(
             'have.text',
-            options.nextJsRouter === 'pages'
-              ? '/pages/multitenant/[tenant]'
-              : '/app/multitenant'
+            options.expectedPathname
           )
           cy.get('button').click()
           cy.get('#client-state').should('have.text', 'pass')
           cy.get('#client-tenant').should('have.text', 'david')
           cy.get('#server-tenant').should('have.text', 'david')
           cy.get('#router-pathname').should(
             'have.text',
-            options.nextJsRouter === 'pages'
-              ? '/pages/multitenant/[tenant]'
-              : '/app/multitenant'
+            options.expectedPathname
           )
           if (shallow === false) {
             cy.get('#server-state').should('have.text', 'pass')
@@ -43,9 +43,7 @@ function testMultiTenant(options: TestConfig) {
           cy.get('#server-state').should('be.empty')
           cy.get('#router-pathname').should(
             'have.text',
-            options.nextJsRouter === 'pages'
-              ? '/pages/multitenant/[tenant]'
-              : '/app/multitenant'
+            options.expectedPathname
           )
         })
       }
@@ -57,10 +55,14 @@ function testMultiTenant(options: TestConfig) {
 
 testMultiTenant({
   path: '/app/multitenant',
-  nextJsRouter: 'app'
+  nextJsRouter: 'app',
+  description: 'Dynamic route',
+  expectedPathname: '/app/multitenant'
 })
 
 testMultiTenant({
   path: '/pages/multitenant',
-  nextJsRouter: 'pages'
+  nextJsRouter: 'pages',
+  description: 'Dynamic route',
+  expectedPathname: '/pages/multitenant/[tenant]'
 })

packages/e2e/next/src/app/app/multitenant/[tenant]/page.tsx

@@ -1,5 +1,5 @@
+import { Display } from 'e2e-shared/components/display'
 import { ShallowUseQueryState } from 'e2e-shared/specs/shallow'
-import { ShallowDisplay } from 'e2e-shared/specs/shallow-display'
 import {
   createSearchParamsCache,
   parseAsString,
@@ -36,7 +36,7 @@ export default async function TenantPage({ params, searchParams }: PageProps) {
       <Suspense>
         <ShallowUseQueryState />
       </Suspense>
-      <ShallowDisplay environment="server" state={cache.get('state')} />
+      <Display environment="server" state={cache.get('state')} />
       <p id="server-tenant">{tenant}</p>
       <Suspense>
         <TenantClient />

packages/e2e/next/src/pages/pages/multitenant/[tenant].tsx

@@ -1,5 +1,5 @@
+import { Display } from 'e2e-shared/components/display'
 import { ShallowUseQueryState } from 'e2e-shared/specs/shallow'
-import { ShallowDisplay } from 'e2e-shared/specs/shallow-display'
 import type { GetServerSidePropsContext, GetServerSidePropsResult } from 'next'
 import { useParams } from 'next/navigation'
 import { useRouter } from 'next/router'
@@ -15,7 +15,7 @@ export default function Page({ serverState, tenant }: Props) {
   return (
     <>
       <ShallowUseQueryState />
-      <ShallowDisplay environment="server" state={serverState} />
+      <Display environment="server" state={serverState} />
       <p id="server-tenant">{tenant}</p>
       <p id="client-tenant">{params?.tenant}</p>
       <p id="router-pathname">{router.pathname}</p>