Update tests root->app

test/e2e/app-dir/app/app/(rootonly)/dashboard/changelog/page.server.js

@@ -1,7 +1,7 @@
 export default function ChangelogPage(props) {
   return (
     <>
-      <p>hello from root/dashboard/changelog</p>
+      <p>hello from app/dashboard/changelog</p>
     </>
   )
 }

test/e2e/app-dir/app/app/(rootonly)/dashboard/hello/page.server.js

@@ -1,7 +1,7 @@
 export default function HelloPage(props) {
   return (
     <>
-      <p>hello from root/dashboard/rootonly/hello</p>
+      <p>hello from app/dashboard/rootonly/hello</p>
     </>
   )
 }

test/e2e/app-dir/app/app/client-component-route/page.client.js

@@ -7,7 +7,7 @@ export default function ClientComponentRoute() {
   }, [count])
   return (
     <>
-      <p>hello from root/client-component-route. count: {count}</p>
+      <p>hello from app/client-component-route. count: {count}</p>
     </>
   )
 }

test/e2e/app-dir/app/app/client-nested/page.server.js

@@ -1,7 +1,7 @@
 export default function ClientPage() {
   return (
     <>
-      <p>hello from root/client-nested</p>
+      <p>hello from app/client-nested</p>
     </>
   )
 }

test/e2e/app-dir/app/app/dashboard/(custom)/deployments/breakdown/page.server.js

@@ -1,7 +1,7 @@
 export default function DeploymentsBreakdownPage(props) {
   return (
     <>
-      <p>hello from root/dashboard/(custom)/deployments/breakdown</p>
+      <p>hello from app/dashboard/(custom)/deployments/breakdown</p>
     </>
   )
 }

test/e2e/app-dir/app/app/dashboard/deployments/[id]/page.server.js

@@ -9,7 +9,7 @@ export async function getServerSideProps({ params }) {
 export default function DeploymentsPage(props) {
   return (
     <>
-      <p>hello from root/dashboard/deployments/[id]. ID is: {props.id}</p>
+      <p>hello from app/dashboard/deployments/[id]. ID is: {props.id}</p>
     </>
   )
 }

test/e2e/app-dir/app/app/dashboard/deployments/info/page.server.js

@@ -1,7 +1,7 @@
 export default function DeploymentsInfoPage(props) {
   return (
     <>
-      <p>hello from root/dashboard/deployments/info</p>
+      <p>hello from app/dashboard/deployments/info</p>
     </>
   )
 }

test/e2e/app-dir/app/app/dashboard/index/page.server.js

@@ -1,7 +1,7 @@
 export default function DashboardIndexPage() {
   return (
     <>
-      <p>hello from root/dashboard/index</p>
+      <p>hello from app/dashboard/index</p>
     </>
   )
 }

test/e2e/app-dir/app/app/dashboard/integrations/page.server.js

@@ -1,7 +1,7 @@
 export default function IntegrationsPage(props) {
   return (
     <>
-      <p>hello from root/dashboard/integrations</p>
+      <p>hello from app/dashboard/integrations</p>
     </>
   )
 }

test/e2e/app-dir/app/app/dashboard/page.server.js

@@ -1,7 +1,7 @@
 export default function DashboardPage(props) {
   return (
     <>
-      <p>hello from root/dashboard</p>
+      <p>hello from app/dashboard</p>
     </>
   )
 }

test/e2e/app-dir/app/app/partial-match-[id]/page.server.js

@@ -9,7 +9,7 @@ export async function getServerSideProps({ params }) {
 export default function DeploymentsPage(props) {
   return (
     <>
-      <p>hello from root/partial-match-[id]. ID is: {props.id}</p>
+      <p>hello from app/partial-match-[id]. ID is: {props.id}</p>
     </>
   )
 }

test/e2e/app-dir/app/app/shared-component-route/page.js

@@ -1,7 +1,7 @@
 export default function SharedComponentRoute() {
   return (
     <>
-      <p>hello from root/shared-component-route</p>
+      <p>hello from app/shared-component-route</p>
     </>
   )
 }

test/e2e/app-dir/app/app/should-not-serve-client/page.client.js

@@ -1,7 +1,7 @@
 export default function ShouldNotServeClientDotJs(props) {
   return (
     <>
-      <p>hello from root/should-not-serve-client</p>
+      <p>hello from app/should-not-serve-client</p>
     </>
   )
 }

test/e2e/app-dir/app/app/should-not-serve-server/page.server.js

@@ -1,7 +1,7 @@
 export default function ShouldNotServeServerDotJs(props) {
   return (
     <>
-      <p>hello from root/should-not-serve-server</p>
+      <p>hello from app/should-not-serve-server</p>
     </>
   )
 }

test/e2e/app-dir/index.test.ts

@@ -54,12 +54,12 @@ describe('views dir', () => {
 
   it('should serve from app', async () => {
     const html = await renderViaHTTP(next.url, '/dashboard')
-    expect(html).toContain('hello from root/dashboard')
+    expect(html).toContain('hello from app/dashboard')
   })
 
   it('should serve /index as separate page', async () => {
     const html = await renderViaHTTP(next.url, '/dashboard/index')
-    expect(html).toContain('hello from root/dashboard/index')
+    expect(html).toContain('hello from app/dashboard/index')
   })
 
   it('should include layouts when no direct parent layout', async () => {
@@ -68,7 +68,7 @@ describe('views dir', () => {
     // Should not be nested in dashboard
     expect($('h1').text()).toBe('Dashboard')
     // Should include the page text
-    expect($('p').text()).toBe('hello from root/dashboard/integrations')
+    expect($('p').text()).toBe('hello from app/dashboard/integrations')
   })
 
   it('should not include parent when not in parent directory with route in directory', async () => {
@@ -86,7 +86,7 @@ describe('views dir', () => {
     expect($('h1').text()).toBeFalsy()
 
     // Should render the page text
-    expect($('p').text()).toBe('hello from root/dashboard/rootonly/hello')
+    expect($('p').text()).toBe('hello from app/dashboard/rootonly/hello')
   })
 
   it('should use new root layout when provided', async () => {
@@ -123,7 +123,7 @@ describe('views dir', () => {
 
     // Should render the page text
     expect($('p').text()).toBe(
-      'hello from root/dashboard/(custom)/deployments/breakdown'
+      'hello from app/dashboard/(custom)/deployments/breakdown'
     )
   })
 
@@ -141,7 +141,7 @@ describe('views dir', () => {
     // Should not be nested in dashboard
     expect($('h1').text()).toBeFalsy()
     // Should include the page text
-    expect($('p').text()).toBe('hello from root/dashboard/changelog')
+    expect($('p').text()).toBe('hello from app/dashboard/changelog')
   })
 
   it('should serve nested parent', async () => {
@@ -158,7 +158,7 @@ describe('views dir', () => {
     const $ = cheerio.load(html)
     // Should include the page text with the parameter
     expect($('p').text()).toBe(
-      'hello from root/dashboard/deployments/[id]. ID is: 123'
+      'hello from app/dashboard/deployments/[id]. ID is: 123'
     )
   })
 
@@ -180,7 +180,7 @@ describe('views dir', () => {
   // to work for /pages as well?
   it.skip('should match partial parameters', async () => {
     const html = await renderViaHTTP(next.url, '/partial-match-123')
-    expect(html).toContain('hello from root/partial-match-[id]. ID is: 123')
+    expect(html).toContain('hello from app/partial-match-[id]. ID is: 123')
   })
 
   describe('server components', () => {
@@ -189,7 +189,7 @@ describe('views dir', () => {
     it('should not serve .server.js as a path', async () => {
       // Without .server.js should serve
       const html = await renderViaHTTP(next.url, '/should-not-serve-server')
-      expect(html).toContain('hello from root/should-not-serve-server')
+      expect(html).toContain('hello from app/should-not-serve-server')
 
       // Should not serve `.server`
       const res = await fetchViaHTTP(
@@ -211,7 +211,7 @@ describe('views dir', () => {
     it('should not serve .client.js as a path', async () => {
       // Without .client.js should serve
       const html = await renderViaHTTP(next.url, '/should-not-serve-client')
-      expect(html).toContain('hello from root/should-not-serve-client')
+      expect(html).toContain('hello from app/should-not-serve-client')
 
       // Should not serve `.client`
       const res = await fetchViaHTTP(
@@ -233,15 +233,15 @@ describe('views dir', () => {
     it('should serve shared component', async () => {
       // Without .client.js should serve
       const html = await renderViaHTTP(next.url, '/shared-component-route')
-      expect(html).toContain('hello from root/shared-component-route')
+      expect(html).toContain('hello from app/shared-component-route')
     })
 
     describe('should serve client component', () => {
       it('should serve server-side', async () => {
         const html = await renderViaHTTP(next.url, '/client-component-route')
         const $ = cheerio.load(html)
         expect($('p').text()).toBe(
-          'hello from root/client-component-route. count: 0'
+          'hello from app/client-component-route. count: 0'
         )
       })
 
@@ -250,7 +250,7 @@ describe('views dir', () => {
 
         // After hydration count should be 1
         expect(await browser.elementByCss('p').text()).toBe(
-          'hello from root/client-component-route. count: 1'
+          'hello from app/client-component-route. count: 1'
         )
       })
     })
@@ -262,7 +262,7 @@ describe('views dir', () => {
         // Should not be nested in dashboard
         expect($('h1').text()).toBe('Client Nested. Count: 0')
         // Should include the page text
-        expect($('p').text()).toBe('hello from root/client-nested')
+        expect($('p').text()).toBe('hello from app/client-nested')
       })
 
       it('should include it client-side', async () => {
@@ -275,7 +275,7 @@ describe('views dir', () => {
 
         // After hydration count should be 1
         expect(await browser.elementByCss('p').text()).toBe(
-          'hello from root/client-nested'
+          'hello from app/client-nested'
         )
       })
     })