Fix regressions in regression suite (#7894)

.mocharc.js

@@ -1,10 +1,10 @@
-{
-  "require": "ts-node/register",
-  "extension": ["js", "ts"],
+module.exports = {
+  require: ['ts-node/register', 'abort-controller/polyfill', __dirname + '/shared/dev/fetch'],
+  extension: ['js', 'ts'],
   // 1 minute test timeout. This must be greater than the default Puppeteer
   // command timeout of 30s in order to get the stack trace to point to the
   // Puppeteer command that failed instead of a cryptic test timeout
   // location.
-  "timeout": "60s",
-  "slow": "2s"
+  timeout: '60s',
+  slow: '2s',
 }

web/src/regression/org.test.ts

@@ -11,11 +11,11 @@ import { PlatformContext } from '../../../shared/src/platform/context'
 import * as GQL from '../../../shared/src/graphql/schema'
 import { parseJSONCOrError } from '../../../shared/src/util/jsonc'
 import { Settings, QuickLink } from '../schema/settings.schema'
-import { isErrorLike } from '@sourcegraph/codeintellify/lib/errors'
 import * as jsoncEdit from '@sqs/jsonc-parser/lib/edit'
 import { retry } from '../../../shared/src/e2e/e2e-test-utils'
 import delay from 'delay'
 import { saveScreenshotsUponFailures } from '../../../shared/src/e2e/screenshotReporter'
+import { isErrorLike } from '../../../shared/src/util/errors'
 
 async function deleteOrganizationByName(
     { requestGraphQL }: Pick<PlatformContext, 'requestGraphQL'>,