From 9853cd3058cf8fe6e8dbc5c91643433341ec3cde Mon Sep 17 00:00:00 2001 From: Felix Becker Date: Mon, 20 Jan 2020 16:22:30 +0100 Subject: [PATCH] Fix regressions in regression suite (#7894) --- .mocharc.json => .mocharc.js | 10 +++++----- web/src/regression/org.test.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) rename .mocharc.json => .mocharc.js (57%) diff --git a/.mocharc.json b/.mocharc.js similarity index 57% rename from .mocharc.json rename to .mocharc.js index e4a0ea80d19..370f6308409 100644 --- a/.mocharc.json +++ b/.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', } diff --git a/web/src/regression/org.test.ts b/web/src/regression/org.test.ts index 288b3e68ed2..0de4998e1e1 100644 --- a/web/src/regression/org.test.ts +++ b/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,