test: Update existing e2e tests and considering the default use case for multi-zones

Author: agustints

test/e2e/multi-zone/app/server.js

@@ -7,7 +7,7 @@ const http = require('http')
   const requestHandlers = new Map()
   const dev = process.env.NODE_ENV !== 'production'
 
-  for (const appName of ['first', 'second']) {
+  for (const appName of ['host', 'guest']) {
     const appDir = path.join(__dirname, 'apps', appName)
     const nextApp = next({
       dir: appDir,
@@ -20,7 +20,7 @@ const http = require('http')
   }
 
   const server = http.createServer(async (req, res) => {
-    const appName = req.url?.split('/')[1].split('?')[0]
+    const appName = req.url.startsWith('/guest') ? 'guest' : 'host'
     const handler = requestHandlers.get(appName)
 
     if (!handler) {

test/e2e/multi-zone/multi-zone.test.ts

@@ -17,19 +17,19 @@ createNextDescribe(
   },
   ({ next, isNextDev }) => {
     it.each([
-      { pathname: '/first', content: ['hello from first app'] },
-      { pathname: '/second', content: ['hello from second app'] },
+      { pathname: '/', content: ['hello from host app'] },
+      { pathname: '/guest', content: ['hello from guest app'] },
       {
-        pathname: '/first/blog/post-1',
-        content: ['hello from first app /blog/[slug]'],
+        pathname: '/blog/post-1',
+        content: ['hello from host app /blog/[slug]'],
       },
       {
-        pathname: '/second/blog/post-1',
-        content: ['hello from second app /blog/[slug]'],
+        pathname: '/guest/blog/post-1',
+        content: ['hello from guest app /blog/[slug]'],
       },
       {
-        pathname: '/second/another/post-1',
-        content: ['hello from second app /another/[slug]'],
+        pathname: '/guest/another/post-1',
+        content: ['hello from guest app /another/[slug]'],
       },
     ])(
       'should correctly respond for $pathname',
@@ -49,7 +49,8 @@ createNextDescribe(
 
     if (isNextDev) {
       async function runHMRTest(app: string) {
-        const browser = await next.browser(`/${app}`)
+        const isHostApp = app === 'host'
+        const browser = await next.browser(isHostApp ? '/' : app)
         expect(await browser.elementByCss('body').text()).toContain(
           `hello from ${app} app`
         )
@@ -82,8 +83,8 @@ createNextDescribe(
       }
 
       it('should support HMR in both apps', async () => {
-        await runHMRTest('first')
-        await runHMRTest('second')
+        await runHMRTest('host')
+        await runHMRTest('guest')
       })
     }
   }