From ef4b169a9a1b07d7358b01ca76f0d79c2c2aa7ad Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Fri, 25 Jun 2021 11:01:37 -0500
Subject: [PATCH] Correct statusCode when visiting _error directly

---
 .../next/next-server/server/next-server.ts    |  5 ++
 .../client-navigation/test/index.test.js      | 54 ++++++-------------
 2 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
index 54594d035482e..ca10c0f8c17fe 100644
--- a/packages/next/next-server/server/next-server.ts
+++ b/packages/next/next-server/server/next-server.ts
@@ -1444,6 +1444,7 @@ export default class Server {
   ): Promise<string | null> {
     const is404Page = pathname === '/404'
     const is500Page = pathname === '/500'
+    const isErrorPage = pathname === '/_error'
 
     const isLikeServerless =
       typeof components.Component === 'object' &&
@@ -1462,6 +1463,10 @@ export default class Server {
       res.statusCode = 404
     }
 
+    if (isErrorPage && res.statusCode === 200) {
+      res.statusCode = 404
+    }
+
     // ensure correct status is set when visiting a status page
     // directly e.g. /500
     if (STATIC_STATUS_PAGES.includes(pathname)) {
diff --git a/test/integration/client-navigation/test/index.test.js b/test/integration/client-navigation/test/index.test.js
index e846a3fe62312..678b88dda5fa3 100644
--- a/test/integration/client-navigation/test/index.test.js
+++ b/test/integration/client-navigation/test/index.test.js
@@ -25,46 +25,26 @@ describe('Client Navigation', () => {
     context.server = await launchApp(join(__dirname, '../'), context.appPort, {
       env: { __NEXT_TEST_WITH_DEVTOOL: 1 },
     })
-
-    const prerender = [
-      '/async-props',
-      '/default-head',
-      '/empty-get-initial-props',
-      '/error',
-      '/finish-response',
-      '/head',
-      '/json',
-      '/link',
-      '/stateless',
-      '/fragment-syntax',
-      '/custom-extension',
-      '/styled-jsx',
-      '/styled-jsx-external',
-      '/with-cdm',
-      '/url-prop',
-
-      '/dynamic/ssr',
-      '/dynamic/[slug]/route',
-
-      '/nav',
-      '/nav/about',
-      '/nav/on-click',
-      '/nav/querystring',
-      '/nav/self-reload',
-      '/nav/hash-changes',
-      '/nav/shallow-routing',
-      '/nav/redirect',
-      '/nav/as-path',
-      '/nav/as-path-using-router',
-
-      '/nested-cdm',
-    ]
-    await Promise.all(
-      prerender.map((route) => renderViaHTTP(context.appPort, route))
-    )
   })
   afterAll(() => killApp(context.server))
 
+  it('should not reload when visiting /_error directly', async () => {
+    const browser = await webdriver(context.appPort, '/_error')
+
+    await browser.eval('window.hello = true')
+
+    // wait on-demand-entries timeout since it can trigger
+    // reloading non-stop
+    for (let i = 0; i < 15; i++) {
+      expect(await browser.eval('window.hello')).toBe(true)
+      await waitFor(1000)
+    }
+    const html = await browser.eval('document.documentElement.innerHTML')
+
+    expect(html).toContain('This page could not be found')
+    expect(html).toContain('404')
+  })
+
   describe('with <Link/>', () => {
     it('should navigate the page', async () => {
       const browser = await webdriver(context.appPort, '/nav')