Merge pull request github#18671 from github/repo-sync

repo sync

Author: Octomerger

.github/workflows/test.yml

@@ -23,9 +23,9 @@ concurrency:
 
 jobs:
   test:
-    # Run on self-hosted if the private repo or ubuntu-latest if the public repo
+    # Run on ubuntu-20.04-xl if the private repo or ubuntu-latest if the public repo
     # See pull # 17442 in the private repo for context
-    runs-on: ${{ fromJSON('["ubuntu-latest", "self-hosted"]')[github.repository == 'github/docs-internal'] }}
+    runs-on: ${{ fromJSON('["ubuntu-latest", "ubuntu-20.04-xl"]')[github.repository == 'github/docs-internal'] }}
     timeout-minutes: 60
     strategy:
       fail-fast: false

lib/cookie-settings.js

@@ -2,7 +2,6 @@ export default {
   httpOnly: true, // can't access these cookies through browser JavaScript
   secure: !['test', 'development'].includes(process.env.NODE_ENV),
   // requires https protocol
-  // `secure` doesn't work with supertest at all
   // http://localhost fails on chrome with secure
   sameSite: 'lax',
   // most browsers are "lax" these days,

middleware/handle-errors.js

@@ -30,13 +30,6 @@ async function logException(error, req) {
 }
 
 export default async function handleError(error, req, res, next) {
-  // When you run tests that use things doing get() requests in
-  // our supertest handler, if something goes wrong anywhere in the app
-  // and its middlewares, you get a 500 but the error is never displayed
-  // anywhere. So this is why we log it additionally.
-  // Note, not using console.error() because it's arguably handled.
-  // Some tests might actually expect a 500 error.
-
   const responseDone = res.headersSent || req.aborted
 
   if (req.path.startsWith('/assets') || req.path.startsWith('/_next/static')) {