From 8b9cc24518ed6118495164d8637559d644e3bf81 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Tue, 8 Feb 2022 16:31:07 -0600
Subject: [PATCH] Fix failing tests from upstream server

---
 test/integration/custom-routes/next.config.js          |  2 +-
 test/integration/custom-routes/test/index.test.js      |  6 +++---
 .../middleware/core/pages/rewrites/_middleware.js      |  2 +-
 test/integration/middleware/core/test/index.test.js    | 10 ++++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/test/integration/custom-routes/next.config.js b/test/integration/custom-routes/next.config.js
index f9552353c2458..7780bda50eebd 100644
--- 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
index b3a2a68ae8ff8..d8face2632f4e 100644
--- a/test/integration/custom-routes/test/index.test.js
+++ b/test/integration/custom-routes/test/index.test.js
@@ -89,13 +89,13 @@ const runTests = (isDev = false) => {
       console.error('Invalid response', html)
     }
     expect(res.status).toBe(200)
-    expect(html).toContain('Example Domain')
+    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'),
-      /Example Domain/
+      /Vercel/
     )
   })
 
@@ -1716,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
index 9365a1ca1713a..27137642a1c14 100644
--- 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
index 2c94d9f3c879b..c6d33990720f1 100644
--- a/test/integration/middleware/core/test/index.test.js
+++ b/test/integration/middleware/core/test/index.test.js
@@ -196,18 +196,20 @@ function rewriteTests(log, locale = '') {
     )
 
     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'
     )
   })