Update failing tests from upstream resource (#34110)

Seems these were failing from https://example.com randomly 404ing x-ref: https://github.com/vercel/next.js/runs/5113528980?check_suite_focus=true#step:8:1465 x-ref: https://github.com/vercel/next.js/runs/5095808948?check_suite_focus=true x-ref: https://github.com/vercel/next.js/runs/5086862695?check_suite_focus=true
vercel · Feb 8, 2022 · 3f0a8d9 · 3f0a8d9
1 parent 1efa892
commit 3f0a8d9
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 22 deletions.
diff --git a/test/integration/custom-routes/next.config.js b/test/integration/custom-routes/next.config.js
@@ -222,7 +222,7 @@ module.exports = {
         },
         {
           source: '/overridden',
-          destination: 'https://example.com',
+          destination: 'https://vercel.com',
         },
       ],
     }

diff --git a/test/integration/custom-routes/test/index.test.js b/test/integration/custom-routes/test/index.test.js
@@ -39,19 +39,6 @@ let appPort
 let app
 
 const runTests = (isDev = false) => {
-  it('should handle external beforeFiles rewrite correctly', async () => {
-    const res = await fetchViaHTTP(appPort, '/overridden')
-    expect(res.status).toBe(200)
-    expect(await res.text()).toContain('Example Domain')
-
-    const browser = await webdriver(appPort, '/nav')
-    await browser.elementByCss('#to-before-files-overridden').click()
-    await check(
-      () => browser.eval('document.documentElement.innerHTML'),
-      /Example Domain/
-    )
-  })
-
   it('should handle has query encoding correctly', async () => {
     for (const expected of [
       {
@@ -94,6 +81,24 @@ const runTests = (isDev = false) => {
     }
   })
 
+  it('should handle external beforeFiles rewrite correctly', async () => {
+    const res = await fetchViaHTTP(appPort, '/overridden')
+    const html = await res.text()
+
+    if (res.status !== 200) {
+      console.error('Invalid response', html)
+    }
+    expect(res.status).toBe(200)
+    expect(html).toContain('Vercel')
+
+    const browser = await webdriver(appPort, '/nav')
+    await browser.elementByCss('#to-before-files-overridden').click()
+    await check(
+      () => browser.eval('document.documentElement.innerHTML'),
+      /Vercel/
+    )
+  })
+
   it('should support long URLs for rewrites', async () => {
     const res = await fetchViaHTTP(
       appPort,
@@ -1711,7 +1716,7 @@ const runTests = (isDev = false) => {
               source: '/old-blog/:path*',
             },
             {
-              destination: 'https://example.com',
+              destination: 'https://vercel.com',
               regex: normalizeRegEx('^\\/overridden(?:\\/)?$'),
               source: '/overridden',
             },

diff --git a/test/integration/middleware/core/pages/rewrites/_middleware.js b/test/integration/middleware/core/pages/rewrites/_middleware.js
@@ -12,7 +12,7 @@ export async function middleware(request) {
   ) {
     const isExternal = url.searchParams.get('override') === 'external'
     return NextResponse.rewrite(
-      isExternal ? 'https://example.com' : '/rewrites/a'
+      isExternal ? 'https://vercel.com' : '/rewrites/a'
     )
   }
 

diff --git a/test/integration/middleware/core/test/index.test.js b/test/integration/middleware/core/test/index.test.js
@@ -165,7 +165,7 @@ function rewriteTests(log, locale = '') {
   it('should override with rewrite internally correctly', async () => {
     const res = await fetchViaHTTP(
       context.appPort,
-      '/rewrites/about',
+      `${locale}/rewrites/about`,
       { override: 'internal' },
       { redirect: 'manual' }
     )
@@ -190,24 +190,26 @@ function rewriteTests(log, locale = '') {
   it('should override with rewrite externally correctly', async () => {
     const res = await fetchViaHTTP(
       context.appPort,
-      '/rewrites/about',
+      `${locale}/rewrites/about`,
       { override: 'external' },
       { redirect: 'manual' }
     )
 
     expect(res.status).toBe(200)
-    expect(await res.text()).toContain('Example Domain')
+    expect(await res.text()).toContain('Vercel')
 
     const browser = await webdriver(context.appPort, `${locale}/rewrites`)
     await browser.elementByCss('#override-with-external-rewrite').click()
     await check(
       () => browser.eval('document.documentElement.innerHTML'),
-      /Example Domain/
+      /Vercel/
     )
-    expect(await browser.eval('window.location.pathname')).toBe(
+    await check(
+      () => browser.eval('window.location.pathname'),
       `${locale || ''}/rewrites/about`
     )
-    expect(await browser.eval('window.location.search')).toBe(
+    await check(
+      () => browser.eval('window.location.search'),
       '?override=external'
     )
   })