From 2ddc4305ca9831893f27d299be2cf41698ad4b00 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 30 Dec 2023 12:05:52 +0100 Subject: [PATCH] chore: errors should be named as such (#14817) --- .eslintignore | 1 + .eslintrc.cjs | 9 ----- docs/TestingAsyncCode.md | 6 +-- docs/TutorialAsync.md | 8 ++-- .../__snapshots__/callDoneTwice.test.ts.snap | 2 +- e2e/__tests__/jsonReporter.test.ts | 8 ++-- e2e/__tests__/testRetries.test.ts | 12 +++--- e2e/call-done-twice/__tests__/index.test.js | 2 +- e2e/failures/__tests__/errorWithCause.test.js | 4 +- .../errorWithCauseInDescribe.test.js | 4 +- e2e/override-globals/__tests__/index.js | 4 +- e2e/read-initial-options/readOptions.js | 4 +- .../run-jest.js | 4 +- e2e/runJest.ts | 4 +- e2e/transform/transform-esm-runner/runner.mjs | 2 +- e2e/transform/transform-runner/runner.ts | 2 +- examples/async/__tests__/user.test.js | 8 ++-- .../src/__tests__/isError.test.ts | 4 +- .../expect/src/__tests__/matchers.test.js | 40 +++++++++---------- packages/expect/src/index.ts | 8 ++-- packages/expect/src/toThrowMatchers.ts | 4 +- packages/jest-changed-files/src/git.ts | 8 ++-- packages/jest-changed-files/src/hg.ts | 8 ++-- packages/jest-changed-files/src/sl.ts | 8 ++-- packages/jest-circus/src/run.ts | 4 +- packages/jest-config/src/normalize.ts | 10 ++--- .../src/readConfigFileAndSetRootDir.ts | 8 ++-- .../src/__tests__/TestScheduler.test.js | 4 +- packages/jest-core/src/cli/index.ts | 4 +- .../jest-core/src/getChangedFilesPromise.ts | 4 +- packages/jest-each/src/bind.ts | 13 +++--- .../jest-fake-timers/src/legacyFakeTimers.ts | 4 +- .../src/__tests__/index.test.js | 8 ++-- .../src/__tests__/worker.test.js | 4 +- packages/jest-haste-map/src/index.ts | 12 +++--- packages/jest-haste-map/src/worker.ts | 4 +- packages/jest-jasmine2/src/PCancelable.ts | 4 +- packages/jest-jasmine2/src/jasmine/Env.ts | 4 +- packages/jest-jasmine2/src/pTimeout.ts | 4 +- packages/jest-jasmine2/src/queueRunner.ts | 4 +- packages/jest-repl/src/cli/repl.ts | 6 ++- packages/jest-repl/src/cli/runtime-cli.ts | 6 ++- .../jest-reporters/src/CoverageReporter.ts | 6 +-- packages/jest-reporters/src/NotifyReporter.ts | 6 +-- packages/jest-resolve/src/fileWalkers.ts | 6 +-- packages/jest-resolve/src/resolver.ts | 8 ++-- packages/jest-runner/src/runTest.ts | 6 +-- .../src/__tests__/Runtime-sourceMaps.test.js | 6 +-- .../src/__tests__/runtime_environment.test.js | 10 ++--- .../__tests__/runtime_require_mock.test.js | 4 +- packages/jest-runtime/src/index.ts | 22 +++++----- packages/jest-snapshot/src/index.ts | 4 +- .../jest-transform/src/ScriptTransformer.ts | 40 +++++++++---------- packages/jest-util/src/createDirectory.ts | 6 +-- packages/jest-util/src/createProcessObject.ts | 6 +-- .../jest-worker/src/__tests__/Farm.test.ts | 10 ++--- .../src/workers/ChildProcessWorker.ts | 4 +- .../src/workers/NodeThreadsWorker.ts | 4 +- .../jest-worker/src/workers/processChild.ts | 4 +- .../jest-worker/src/workers/threadChild.ts | 8 ++-- packages/pretty-format/__benchmarks__/test.js | 4 +- scripts/buildTs.mjs | 8 ++-- scripts/lintTs.mjs | 4 +- website/fetchSupporters.js | 4 +- .../version-29.4/TestingAsyncCode.md | 6 +-- .../version-29.4/TutorialAsync.md | 8 ++-- .../version-29.5/TestingAsyncCode.md | 6 +-- .../version-29.5/TutorialAsync.md | 8 ++-- .../version-29.6/TestingAsyncCode.md | 6 +-- .../version-29.6/TutorialAsync.md | 8 ++-- .../version-29.7/TestingAsyncCode.md | 6 +-- .../version-29.7/TutorialAsync.md | 8 ++-- 72 files changed, 253 insertions(+), 254 deletions(-) diff --git a/.eslintignore b/.eslintignore index f27fa20f2296..3d5e598e2728 100644 --- a/.eslintignore +++ b/.eslintignore @@ -12,6 +12,7 @@ website/static # Third-party script packages/jest-diff/src/cleanupSemantic.ts +e2e/native-esm/wasm-bindgen/index_bg.js **/.yarn **/.pnp.* diff --git a/.eslintrc.cjs b/.eslintrc.cjs index a22b7155c873..828d8326691f 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -425,14 +425,6 @@ module.exports = { 'no-unused-vars': 'off', }, }, - { - files: 'e2e/native-esm/wasm-bindgen/index_bg.js', - rules: { - 'unicorn/prefer-code-point': 'off', - 'unicorn/prefer-optional-catch-binding': 'off', - 'unicorn/text-encoding-identifier-case': 'off', - }, - }, { files: 'packages/jest-mock/src/__tests__/**/*', rules: { @@ -711,7 +703,6 @@ module.exports = { 'unicorn/prefer-reflect-apply': 'off', // TODO: turn on at some point - 'unicorn/catch-error-name': 'off', 'unicorn/error-message': 'off', 'unicorn/no-object-as-default-parameter': 'off', 'unicorn/no-typeof-undefined': 'off', diff --git a/docs/TestingAsyncCode.md b/docs/TestingAsyncCode.md index 87c4e9c4ec03..ef7a51375265 100644 --- a/docs/TestingAsyncCode.md +++ b/docs/TestingAsyncCode.md @@ -33,8 +33,8 @@ test('the fetch fails with an error', async () => { expect.assertions(1); try { await fetchData(); - } catch (e) { - expect(e).toMatch('error'); + } catch (error) { + expect(error).toMatch('error'); } }); ``` @@ -64,7 +64,7 @@ If you expect a promise to be rejected, use the `.catch` method. Make sure to ad ```js test('the fetch fails with an error', () => { expect.assertions(1); - return fetchData().catch(e => expect(e).toMatch('error')); + return fetchData().catch(error => expect(error).toMatch('error')); }); ``` diff --git a/docs/TutorialAsync.md b/docs/TutorialAsync.md index 43618511429b..0a7e17cdeb16 100644 --- a/docs/TutorialAsync.md +++ b/docs/TutorialAsync.md @@ -114,8 +114,8 @@ Errors can be handled using the `.catch` method. Make sure to add `expect.assert // Testing for async errors using Promise.catch. it('tests error with promises', () => { expect.assertions(1); - return user.getUserName(2).catch(e => - expect(e).toEqual({ + return user.getUserName(2).catch(error => + expect(error).toEqual({ error: 'User with 2 not found.', }), ); @@ -126,8 +126,8 @@ it('tests error with async/await', async () => { expect.assertions(1); try { await user.getUserName(1); - } catch (e) { - expect(e).toEqual({ + } catch (error) { + expect(error).toEqual({ error: 'User with 1 not found.', }); } diff --git a/e2e/__tests__/__snapshots__/callDoneTwice.test.ts.snap b/e2e/__tests__/__snapshots__/callDoneTwice.test.ts.snap index b735f4d03853..1d557cdad0d5 100644 --- a/e2e/__tests__/__snapshots__/callDoneTwice.test.ts.snap +++ b/e2e/__tests__/__snapshots__/callDoneTwice.test.ts.snap @@ -25,7 +25,7 @@ exports[`\`done()\` should not be called more than once 1`] = ` > 17 | done(); | ^ 18 | }) - 19 | .catch(err => err); + 19 | .catch(error => error); 20 | }); at done (__tests__/index.test.js:17:9) diff --git a/e2e/__tests__/jsonReporter.test.ts b/e2e/__tests__/jsonReporter.test.ts index 96494e425f6d..03b01a6fccf2 100644 --- a/e2e/__tests__/jsonReporter.test.ts +++ b/e2e/__tests__/jsonReporter.test.ts @@ -32,9 +32,9 @@ describe('JSON Reporter', () => { try { jsonResult = JSON.parse(testOutput); - } catch (err: any) { + } catch (error: any) { throw new Error( - `Can't parse the JSON result from ${outputFileName}, ${err.toString()}`, + `Can't parse the JSON result from ${outputFileName}, ${error.toString()}`, ); } @@ -85,9 +85,9 @@ describe('JSON Reporter', () => { try { jsonResult = JSON.parse(result.stdout); - } catch (err: any) { + } catch (error: any) { throw new Error( - `Can't parse the JSON result from stdout${err.toString()}`, + `Can't parse the JSON result from stdout${error.toString()}`, ); } diff --git a/e2e/__tests__/testRetries.test.ts b/e2e/__tests__/testRetries.test.ts index 551829cd7874..acb3ffc25f39 100644 --- a/e2e/__tests__/testRetries.test.ts +++ b/e2e/__tests__/testRetries.test.ts @@ -79,9 +79,9 @@ describe('Test Retries', () => { try { jsonResult = JSON.parse(testOutput); - } catch (err: any) { + } catch (error: any) { throw new Error( - `Can't parse the JSON result from ${outputFileName}, ${err.toString()}`, + `Can't parse the JSON result from ${outputFileName}, ${error.toString()}`, ); } @@ -110,9 +110,9 @@ describe('Test Retries', () => { try { jsonResult = JSON.parse(testOutput); - } catch (err: any) { + } catch (error: any) { throw new Error( - `Can't parse the JSON result from ${outputFileName}, ${err.toString()}`, + `Can't parse the JSON result from ${outputFileName}, ${error.toString()}`, ); } @@ -141,9 +141,9 @@ describe('Test Retries', () => { try { jsonResult = JSON.parse(testOutput); - } catch (err: any) { + } catch (error: any) { throw new Error( - `Can't parse the JSON result from ${outputFileName}, ${err.toString()}`, + `Can't parse the JSON result from ${outputFileName}, ${error.toString()}`, ); } diff --git a/e2e/call-done-twice/__tests__/index.test.js b/e2e/call-done-twice/__tests__/index.test.js index 78cfd3384d7f..7b7c8e83ffc5 100644 --- a/e2e/call-done-twice/__tests__/index.test.js +++ b/e2e/call-done-twice/__tests__/index.test.js @@ -16,7 +16,7 @@ describe('`done()` called more than once', () => { done(); done(); }) - .catch(err => err); + .catch(error => error); }); }); diff --git a/e2e/failures/__tests__/errorWithCause.test.js b/e2e/failures/__tests__/errorWithCause.test.js index 4ff87c40f681..4bac09a82653 100644 --- a/e2e/failures/__tests__/errorWithCause.test.js +++ b/e2e/failures/__tests__/errorWithCause.test.js @@ -23,8 +23,8 @@ function g() { function f() { try { g(); - } catch (err) { - throw buildErrorWithCause('error during f', {cause: err}); + } catch (error) { + throw buildErrorWithCause('error during f', {cause: error}); } } diff --git a/e2e/failures/__tests__/errorWithCauseInDescribe.test.js b/e2e/failures/__tests__/errorWithCauseInDescribe.test.js index e58731e43229..2eeda25d981d 100644 --- a/e2e/failures/__tests__/errorWithCauseInDescribe.test.js +++ b/e2e/failures/__tests__/errorWithCauseInDescribe.test.js @@ -23,8 +23,8 @@ function g() { function f() { try { g(); - } catch (err) { - throw buildErrorWithCause('error during f', {cause: err}); + } catch (error) { + throw buildErrorWithCause('error during f', {cause: error}); } } diff --git a/e2e/override-globals/__tests__/index.js b/e2e/override-globals/__tests__/index.js index 91f6dd01c9db..06081fcaf47d 100644 --- a/e2e/override-globals/__tests__/index.js +++ b/e2e/override-globals/__tests__/index.js @@ -21,8 +21,8 @@ describe('parent', () => { try { expect(() => new Promise()).toThrow('Booo'); done(); - } catch (e) { - done.fail(e); + } catch (error) { + done.fail(error); } }, 10); }); diff --git a/e2e/read-initial-options/readOptions.js b/e2e/read-initial-options/readOptions.js index 367916f90570..2bb1084d28f8 100644 --- a/e2e/read-initial-options/readOptions.js +++ b/e2e/read-initial-options/readOptions.js @@ -16,7 +16,7 @@ async function readConfig() { } console.log(JSON.stringify(await readInitialOptions(config, options))); } -readConfig().catch(err => { - console.error(err); +readConfig().catch(error => { + console.error(error); process.exitCode = 1; }); diff --git a/e2e/run-programmatically-multiple-projects/run-jest.js b/e2e/run-programmatically-multiple-projects/run-jest.js index 7fff6f8ddc32..eacc3eb54db5 100644 --- a/e2e/run-programmatically-multiple-projects/run-jest.js +++ b/e2e/run-programmatically-multiple-projects/run-jest.js @@ -16,7 +16,7 @@ const config = { runCLI({config: JSON.stringify(config)}, [process.cwd()]) .then(() => console.log('run-programmatically-mutiple-projects completed')) - .catch(err => { - console.error(err); + .catch(error => { + console.error(error); process.exitCode = 1; }); diff --git a/e2e/runJest.ts b/e2e/runJest.ts index 27e9be7600c5..3a2bc5d756ae 100644 --- a/e2e/runJest.ts +++ b/e2e/runJest.ts @@ -151,10 +151,10 @@ export const json = function ( ...result, json: JSON.parse(result.stdout), }; - } catch (e: any) { + } catch (error: any) { throw new Error(dedent` Can't parse JSON. - ERROR: ${e.name} ${e.message} + ERROR: ${error.name} ${error.message} STDOUT: ${result.stdout} STDERR: ${result.stderr} `); diff --git a/e2e/transform/transform-esm-runner/runner.mjs b/e2e/transform/transform-esm-runner/runner.mjs index d656faa75186..7e423665ac00 100644 --- a/e2e/transform/transform-esm-runner/runner.mjs +++ b/e2e/transform/transform-esm-runner/runner.mjs @@ -39,7 +39,7 @@ export default class BaseTestRunner { }; }) .then(result => onResult(test, result)) - .catch(err => onFailure(test, err)), + .catch(error => onFailure(test, error)), Promise.resolve(), ); } diff --git a/e2e/transform/transform-runner/runner.ts b/e2e/transform/transform-runner/runner.ts index 3e88ceb5ab27..091e3d9f8c14 100644 --- a/e2e/transform/transform-runner/runner.ts +++ b/e2e/transform/transform-runner/runner.ts @@ -63,7 +63,7 @@ export default class BaseTestRunner { }; }) .then(result => onResult(test, result)) - .catch(err => onFailure(test, err)), + .catch(error => onFailure(test, error)), ), Promise.resolve(), ); diff --git a/examples/async/__tests__/user.test.js b/examples/async/__tests__/user.test.js index e64c324d72c0..702df2b0c8b6 100644 --- a/examples/async/__tests__/user.test.js +++ b/examples/async/__tests__/user.test.js @@ -42,8 +42,8 @@ it('tests error with rejects', () => { // Testing for async errors using Promise.catch. test('tests error with promises', async () => { expect.assertions(1); - return user.getUserName(2).catch(e => - expect(e).toEqual({ + return user.getUserName(2).catch(error => + expect(error).toEqual({ error: 'User with 2 not found.', }), ); @@ -54,8 +54,8 @@ it('tests error with async/await', async () => { expect.assertions(1); try { await user.getUserName(1); - } catch (e) { - expect(e).toEqual({ + } catch (error) { + expect(error).toEqual({ error: 'User with 1 not found.', }); } diff --git a/packages/expect-utils/src/__tests__/isError.test.ts b/packages/expect-utils/src/__tests__/isError.test.ts index df6dfdf13455..24ac7b75cd23 100644 --- a/packages/expect-utils/src/__tests__/isError.test.ts +++ b/packages/expect-utils/src/__tests__/isError.test.ts @@ -55,8 +55,8 @@ describe('isError', () => { testErrorFromDifferentContext(win => { try { win.document.querySelectorAll(''); - } catch (e) { - return e as Error; + } catch (error) { + return error as Error; } return null; diff --git a/packages/expect/src/__tests__/matchers.test.js b/packages/expect/src/__tests__/matchers.test.js index d800345a6a35..6f636471a494 100644 --- a/packages/expect/src/__tests__/matchers.test.js +++ b/packages/expect/src/__tests__/matchers.test.js @@ -71,8 +71,8 @@ describe('.rejects', () => { let error; try { jestExpect(value).rejects.toBe(111); - } catch (e) { - error = e; + } catch (rejectedError) { + error = rejectedError; } expect(error).toBeDefined(); }); @@ -81,8 +81,8 @@ describe('.rejects', () => { let error; try { await jestExpect(value).rejects.toBeDefined(); - } catch (e) { - error = e; + } catch (rejectedError) { + error = rejectedError; } expect(error).toBeDefined(); expect(error.message).toMatchSnapshot(); @@ -94,8 +94,8 @@ describe('.rejects', () => { let error; try { jestExpect(value).rejects.not.toBe(111); - } catch (e) { - error = e; + } catch (rejectedError) { + error = rejectedError; } expect(error).toBeDefined(); }); @@ -104,8 +104,8 @@ describe('.rejects', () => { let error; try { await jestExpect(value).rejects.not.toBeDefined(); - } catch (e) { - error = e; + } catch (rejectedError) { + error = rejectedError; } expect(error).toBeDefined(); expect(error.message).toMatchSnapshot(); @@ -116,8 +116,8 @@ describe('.rejects', () => { let error; try { await jestExpect(Promise.resolve(4)).rejects.toBe(4); - } catch (e) { - error = e; + } catch (error_) { + error = error_; } expect(error).toBeDefined(); expect(error.message).toMatchSnapshot(); @@ -148,8 +148,8 @@ describe('.resolves', () => { let error; try { jestExpect(value).resolves.toBeDefined(); - } catch (e) { - error = e; + } catch (rejectedError) { + error = rejectedError; } expect(error).toBeDefined(); expect(error.message).toMatchSnapshot(); @@ -159,8 +159,8 @@ describe('.resolves', () => { let error; try { await jestExpect(value).resolves.toBeDefined(); - } catch (e) { - error = e; + } catch (rejectedError) { + error = rejectedError; } expect(error).toBeDefined(); expect(error.message).toMatchSnapshot(); @@ -172,8 +172,8 @@ describe('.resolves', () => { let error; try { jestExpect(value).resolves.not.toBeDefined(); - } catch (e) { - error = e; + } catch (rejectedError) { + error = rejectedError; } expect(error).toBeDefined(); expect(error.message).toMatchSnapshot(); @@ -183,8 +183,8 @@ describe('.resolves', () => { let error; try { await jestExpect(value).resolves.not.toBeDefined(); - } catch (e) { - error = e; + } catch (rejectedError) { + error = rejectedError; } expect(error).toBeDefined(); expect(error.message).toMatchSnapshot(); @@ -195,8 +195,8 @@ describe('.resolves', () => { let error; try { await jestExpect(Promise.reject(4)).resolves.toBe(4); - } catch (e) { - error = e; + } catch (error_) { + error = error_; } expect(error).toBeDefined(); expect(error.message).toMatchSnapshot(); diff --git a/packages/expect/src/index.ts b/packages/expect/src/index.ts index ab752b73570c..33198b56645e 100644 --- a/packages/expect/src/index.ts +++ b/packages/expect/src/index.ts @@ -193,7 +193,7 @@ const makeResolveMatcher = null, args, ), - reason => { + error => { outerErr.message = `${matcherUtils.matcherHint( matcherName, @@ -202,7 +202,7 @@ const makeResolveMatcher = options, )}\n\n` + 'Received promise rejected instead of resolved\n' + - `Rejected to value: ${matcherUtils.printReceived(reason)}`; + `Rejected to value: ${matcherUtils.printReceived(error)}`; throw outerErr; }, ); @@ -256,8 +256,8 @@ const makeRejectMatcher = `Resolved to value: ${matcherUtils.printReceived(result)}`; throw outerErr; }, - reason => - makeThrowingMatcher(matcher, isNot, 'rejects', reason, innerErr).apply( + error => + makeThrowingMatcher(matcher, isNot, 'rejects', error, innerErr).apply( null, args, ), diff --git a/packages/expect/src/toThrowMatchers.ts b/packages/expect/src/toThrowMatchers.ts index 19225bf5781f..dfda024afb8c 100644 --- a/packages/expect/src/toThrowMatchers.ts +++ b/packages/expect/src/toThrowMatchers.ts @@ -91,8 +91,8 @@ export const createMatcher = ( if (typeof received === 'function') { try { received(); - } catch (e) { - thrown = getThrown(e); + } catch (error) { + thrown = getThrown(error); } } else { if (!fromPromise) { diff --git a/packages/jest-changed-files/src/git.ts b/packages/jest-changed-files/src/git.ts index 111185ebe538..c1d8a01d04cf 100644 --- a/packages/jest-changed-files/src/git.ts +++ b/packages/jest-changed-files/src/git.ts @@ -19,14 +19,14 @@ const findChangedFilesUsingCommand = async ( try { result = await execa('git', args, {cwd}); - } catch (e) { - if (types.isNativeError(e)) { - const err = e as execa.ExecaError; + } catch (error) { + if (types.isNativeError(error)) { + const err = error as execa.ExecaError; // TODO: Should we keep the original `message`? err.message = err.stderr; } - throw e; + throw error; } return result.stdout diff --git a/packages/jest-changed-files/src/hg.ts b/packages/jest-changed-files/src/hg.ts index 3bfeb416dffe..f9e7398d8a2f 100644 --- a/packages/jest-changed-files/src/hg.ts +++ b/packages/jest-changed-files/src/hg.ts @@ -34,14 +34,14 @@ const adapter: SCMAdapter = { try { result = await execa('hg', args, {cwd, env}); - } catch (e) { - if (types.isNativeError(e)) { - const err = e as execa.ExecaError; + } catch (error) { + if (types.isNativeError(error)) { + const err = error as execa.ExecaError; // TODO: Should we keep the original `message`? err.message = err.stderr; } - throw e; + throw error; } return result.stdout diff --git a/packages/jest-changed-files/src/sl.ts b/packages/jest-changed-files/src/sl.ts index 03f7c76dff93..50ee99122757 100644 --- a/packages/jest-changed-files/src/sl.ts +++ b/packages/jest-changed-files/src/sl.ts @@ -38,14 +38,14 @@ const adapter: SCMAdapter = { try { result = await execa('sl', args, {cwd, env}); - } catch (e) { - if (types.isNativeError(e)) { - const err = e as execa.ExecaError; + } catch (error) { + if (types.isNativeError(error)) { + const err = error as execa.ExecaError; // TODO: Should we keep the original `message`? err.message = err.stderr; } - throw e; + throw error; } return result.stdout diff --git a/packages/jest-circus/src/run.ts b/packages/jest-circus/src/run.ts index d78f25b20839..40f9695959ec 100644 --- a/packages/jest-circus/src/run.ts +++ b/packages/jest-circus/src/run.ts @@ -168,9 +168,9 @@ function startTestsConcurrently(concurrentTests: Array) { // eslint-disable-next-line @typescript-eslint/no-empty-function promise.catch(() => {}); test.fn = () => promise; - } catch (err) { + } catch (error) { test.fn = () => { - throw err; + throw error; }; } } diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts index 9fd00cbc488b..9062f3dfd600 100644 --- a/packages/jest-config/src/normalize.ts +++ b/packages/jest-config/src/normalize.ts @@ -74,12 +74,12 @@ function verifyDirectoryExists(path: string, key: string) { )} option is not a directory.`, ); } - } catch (err: any) { - if (err instanceof ValidationError) { - throw err; + } catch (error: any) { + if (error instanceof ValidationError) { + throw error; } - if (err.code === 'ENOENT') { + if (error.code === 'ENOENT') { throw createConfigError( ` Directory ${chalk.bold(path)} in the ${chalk.bold( key, @@ -91,7 +91,7 @@ function verifyDirectoryExists(path: string, key: string) { throw createConfigError( ` Got an error trying to find ${chalk.bold(path)} in the ${chalk.bold( key, - )} option.\n\n Error was: ${err.message}`, + )} option.\n\n Error was: ${error.message}`, ); } } diff --git a/packages/jest-config/src/readConfigFileAndSetRootDir.ts b/packages/jest-config/src/readConfigFileAndSetRootDir.ts index 5de67af65665..0b21f18c8038 100644 --- a/packages/jest-config/src/readConfigFileAndSetRootDir.ts +++ b/packages/jest-config/src/readConfigFileAndSetRootDir.ts @@ -121,13 +121,13 @@ async function registerTsNode(): Promise { '**': 'cjs', }, }); - } catch (e: any) { - if (e.code === 'ERR_MODULE_NOT_FOUND') { + } catch (error: any) { + if (error.code === 'ERR_MODULE_NOT_FOUND') { throw new Error( - `Jest: 'ts-node' is required for the TypeScript configuration files. Make sure it is installed\nError: ${e.message}`, + `Jest: 'ts-node' is required for the TypeScript configuration files. Make sure it is installed\nError: ${error.message}`, ); } - throw e; + throw error; } } diff --git a/packages/jest-core/src/__tests__/TestScheduler.test.js b/packages/jest-core/src/__tests__/TestScheduler.test.js index e3e0eb34dbba..6f8c3977aefe 100644 --- a/packages/jest-core/src/__tests__/TestScheduler.test.js +++ b/packages/jest-core/src/__tests__/TestScheduler.test.js @@ -347,8 +347,8 @@ describe('scheduleTests should always dispatch runStart and runComplete events', throw new Error('should throw exception'); } expect(result.runExecError).toBeUndefined(); - } catch (e) { - expect(e).toEqual(errorMsg); + } catch (error) { + expect(error).toEqual(errorMsg); } expect(mockReporter.onRunStart).toHaveBeenCalledTimes(1); diff --git a/packages/jest-core/src/cli/index.ts b/packages/jest-core/src/cli/index.ts index d89812411a64..ca35c0556d53 100644 --- a/packages/jest-core/src/cli/index.ts +++ b/packages/jest-core/src/cli/index.ts @@ -199,8 +199,8 @@ const _run10000 = async ( filterSetupPromise = (async () => { try { await rawFilter.setup(); - } catch (err) { - return err; + } catch (error) { + return error; } return undefined; })(); diff --git a/packages/jest-core/src/getChangedFilesPromise.ts b/packages/jest-core/src/getChangedFilesPromise.ts index 4d8054128d9c..33d39de19ca3 100644 --- a/packages/jest-core/src/getChangedFilesPromise.ts +++ b/packages/jest-core/src/getChangedFilesPromise.ts @@ -31,8 +31,8 @@ export default function getChangedFilesPromise( changedSince: globalConfig.changedSince, lastCommit: globalConfig.lastCommit, withAncestor: globalConfig.changedFilesWithAncestor, - }).catch(e => { - const message = formatExecError(e, configs[0], {noStackTrace: true}) + }).catch(error => { + const message = formatExecError(error, configs[0], {noStackTrace: true}) .split('\n') .filter(line => !line.includes('Command failed:')) .join('\n'); diff --git a/packages/jest-each/src/bind.ts b/packages/jest-each/src/bind.ts index 890ef103abf1..98e7991f14d9 100644 --- a/packages/jest-each/src/bind.ts +++ b/packages/jest-each/src/bind.ts @@ -38,7 +38,7 @@ export default function bind( table: Global.EachTable, ...taggedTemplateData: Global.TemplateData ) => { - const error = new ErrorWithStack(undefined, bindWrap); + const errorWithStack = new ErrorWithStack(undefined, bindWrap); return function eachBind( title: Global.BlockNameLike, @@ -57,7 +57,7 @@ export default function bind( row.title, applyArguments(supportsDone, row.arguments, test), timeout, - error, + errorWithStack, ) : cb( row.title, @@ -67,9 +67,12 @@ export default function bind( } return; - } catch (e: any) { - const err = new Error(e.message); - err.stack = error.stack?.replace(/^Error: /s, `Error: ${e.message}`); + } catch (error: any) { + const err = new Error(error.message); + err.stack = errorWithStack.stack?.replace( + /^Error: /s, + `Error: ${error.message}`, + ); return cb(title, () => { throw err; diff --git a/packages/jest-fake-timers/src/legacyFakeTimers.ts b/packages/jest-fake-timers/src/legacyFakeTimers.ts index 56657a021e97..f955ae35161c 100644 --- a/packages/jest-fake-timers/src/legacyFakeTimers.ts +++ b/packages/jest-fake-timers/src/legacyFakeTimers.ts @@ -324,9 +324,9 @@ export default class FakeTimers { let errThrown = false; try { cb(); - } catch (e) { + } catch (error) { errThrown = true; - cbErr = e; + cbErr = error; } this._global.clearImmediate = prevClearImmediate; diff --git a/packages/jest-haste-map/src/__tests__/index.test.js b/packages/jest-haste-map/src/__tests__/index.test.js index e860c6e326e9..e94ec8862d50 100644 --- a/packages/jest-haste-map/src/__tests__/index.test.js +++ b/packages/jest-haste-map/src/__tests__/index.test.js @@ -376,8 +376,8 @@ describe('HasteMap', () => { try { await (await HasteMap.create(config)).build(); - } catch (err) { - expect(err.message).toBe( + } catch (error) { + expect(error.message).toBe( 'jest-haste-map: the `ignorePattern` option must be a RegExp', ); } @@ -819,8 +819,8 @@ describe('HasteMap', () => { ...defaultConfig, }) ).build(); - } catch (err) { - expect(err.message).toBe( + } catch (error) { + expect(error.message).toBe( 'Duplicated files or mocks. Please check the console for more info', ); } diff --git a/packages/jest-haste-map/src/__tests__/worker.test.js b/packages/jest-haste-map/src/__tests__/worker.test.js index 2000b1adf78d..833884a2052e 100644 --- a/packages/jest-haste-map/src/__tests__/worker.test.js +++ b/packages/jest-haste-map/src/__tests__/worker.test.js @@ -138,8 +138,8 @@ describe('worker', () => { try { await worker({computeDependencies: true, filePath: '/kiwi.js', rootDir}); - } catch (err) { - error = err; + } catch (thrownError) { + error = thrownError; } expect(error.message).toBe("Cannot read path '/kiwi.js'."); diff --git a/packages/jest-haste-map/src/index.ts b/packages/jest-haste-map/src/index.ts index 0580e84b638d..3dcf5d5b1c12 100644 --- a/packages/jest-haste-map/src/index.ts +++ b/packages/jest-haste-map/src/index.ts @@ -772,7 +772,7 @@ class HasteMap extends EventEmitter implements IHasteMap { roots: options.roots, }; - const retry = (error: Error) => { + const retry = (retryError: Error) => { if (crawl === watchmanCrawl) { this._console.warn( 'jest-haste-map: Watchman crawl failed. Retrying once with node ' + @@ -780,18 +780,18 @@ class HasteMap extends EventEmitter implements IHasteMap { " Usually this happens when watchman isn't running. Create an " + "empty `.watchmanconfig` file in your project's root folder or " + 'initialize a git or hg repository in your project.\n' + - ` ${error}`, + ` ${retryError}`, ); - return nodeCrawl(crawlerOptions).catch(e => { + return nodeCrawl(crawlerOptions).catch(error => { throw new Error( 'Crawler retry failed:\n' + - ` Original error: ${error.message}\n` + - ` Retry error: ${e.message}\n`, + ` Original error: ${retryError.message}\n` + + ` Retry error: ${error.message}\n`, ); }); } - throw error; + throw retryError; }; try { diff --git a/packages/jest-haste-map/src/worker.ts b/packages/jest-haste-map/src/worker.ts index 86457b85c426..dadcf1d8de13 100644 --- a/packages/jest-haste-map/src/worker.ts +++ b/packages/jest-haste-map/src/worker.ts @@ -66,8 +66,8 @@ export async function worker(data: WorkerMessage): Promise { id = fileData.name; module = [relativeFilePath, H.PACKAGE]; } - } catch (err: any) { - throw new Error(`Cannot parse ${filePath} as JSON: ${err.message}`); + } catch (error: any) { + throw new Error(`Cannot parse ${filePath} as JSON: ${error.message}`); } } else if (!blacklist.has(filePath.slice(filePath.lastIndexOf('.')))) { // Process a random file that is returned as a MODULE. diff --git a/packages/jest-jasmine2/src/PCancelable.ts b/packages/jest-jasmine2/src/PCancelable.ts index ee96e44fa908..e373720cc3df 100644 --- a/packages/jest-jasmine2/src/PCancelable.ts +++ b/packages/jest-jasmine2/src/PCancelable.ts @@ -77,8 +77,8 @@ export default class PCancelable implements PromiseLike { if (typeof this._cancel === 'function') { try { this._cancel(); - } catch (err) { - this._reject(err); + } catch (error) { + this._reject(error); } } diff --git a/packages/jest-jasmine2/src/jasmine/Env.ts b/packages/jest-jasmine2/src/jasmine/Env.ts index c97eb4b1adcf..8fdb77e25d10 100644 --- a/packages/jest-jasmine2/src/jasmine/Env.ts +++ b/packages/jest-jasmine2/src/jasmine/Env.ts @@ -452,8 +452,8 @@ export default function jasmineEnv(j$: Jasmine) { let describeReturnValue: unknown | Error; try { describeReturnValue = specDefinitions.call(suite); - } catch (e: any) { - declarationError = e; + } catch (error: any) { + declarationError = error; } if (isPromise(describeReturnValue)) { diff --git a/packages/jest-jasmine2/src/pTimeout.ts b/packages/jest-jasmine2/src/pTimeout.ts index 67d802e8cd36..09141f0c6ce8 100644 --- a/packages/jest-jasmine2/src/pTimeout.ts +++ b/packages/jest-jasmine2/src/pTimeout.ts @@ -21,9 +21,9 @@ export default function pTimeout( clearTimeout(timer); resolve(val); }, - err => { + error => { clearTimeout(timer); - reject(err); + reject(error); }, ); }); diff --git a/packages/jest-jasmine2/src/queueRunner.ts b/packages/jest-jasmine2/src/queueRunner.ts index 607daba753ea..f473adf4d90d 100644 --- a/packages/jest-jasmine2/src/queueRunner.ts +++ b/packages/jest-jasmine2/src/queueRunner.ts @@ -55,8 +55,8 @@ export default function queueRunner(options: Options): PromiseLike & { }; try { fn.call(options.userContext, next); - } catch (e: any) { - options.onException(e); + } catch (error: any) { + options.onException(error); resolve(); } }); diff --git a/packages/jest-repl/src/cli/repl.ts b/packages/jest-repl/src/cli/repl.ts index 7b8356c98f75..648c4acc3ac9 100644 --- a/packages/jest-repl/src/cli/repl.ts +++ b/packages/jest-repl/src/cli/repl.ts @@ -50,8 +50,10 @@ const evalCommand: repl.REPLEval = ( : transformResult.code; } result = runInThisContext(cmd) as unknown; - } catch (e: any) { - return callback(isRecoverableError(e) ? new repl.Recoverable(e) : e); + } catch (error: any) { + return callback( + isRecoverableError(error) ? new repl.Recoverable(error) : error, + ); } return callback(null, result); }; diff --git a/packages/jest-repl/src/cli/runtime-cli.ts b/packages/jest-repl/src/cli/runtime-cli.ts index a8cdaf11606d..335af1858dc1 100644 --- a/packages/jest-repl/src/cli/runtime-cli.ts +++ b/packages/jest-repl/src/cli/runtime-cli.ts @@ -140,8 +140,10 @@ export async function run( } else { runtime.requireModule(filePath); } - } catch (e: any) { - console.error(chalk.red(util.types.isNativeError(e) ? e.stack : e)); + } catch (error: any) { + console.error( + chalk.red(util.types.isNativeError(error) ? error.stack : error), + ); process.on('exit', () => { process.exitCode = 1; }); diff --git a/packages/jest-reporters/src/CoverageReporter.ts b/packages/jest-reporters/src/CoverageReporter.ts index 0c66eee37db2..6b8ab05076cd 100644 --- a/packages/jest-reporters/src/CoverageReporter.ts +++ b/packages/jest-reporters/src/CoverageReporter.ts @@ -91,12 +91,12 @@ export default class CoverageReporter extends BaseReporter { .execute(reportContext); } aggregatedResults.coverageMap = map; - } catch (e: any) { + } catch (error: any) { console.error( chalk.red(` Failed to write coverage reports: - ERROR: ${e.toString()} - STACK: ${e.stack} + ERROR: ${error.toString()} + STACK: ${error.stack} `), ); } diff --git a/packages/jest-reporters/src/NotifyReporter.ts b/packages/jest-reporters/src/NotifyReporter.ts index 101c20955554..6f21108dcccc 100644 --- a/packages/jest-reporters/src/NotifyReporter.ts +++ b/packages/jest-reporters/src/NotifyReporter.ts @@ -158,9 +158,9 @@ export default class NotifyReporter extends BaseReporter { function loadNotifier(): typeof import('node-notifier') { try { return require('node-notifier'); - } catch (err: any) { - if (err.code !== 'MODULE_NOT_FOUND') { - throw err; + } catch (error: any) { + if (error.code !== 'MODULE_NOT_FOUND') { + throw error; } throw new Error( diff --git a/packages/jest-resolve/src/fileWalkers.ts b/packages/jest-resolve/src/fileWalkers.ts index 35d4d08a63fb..82ea9d6c41b1 100644 --- a/packages/jest-resolve/src/fileWalkers.ts +++ b/packages/jest-resolve/src/fileWalkers.ts @@ -31,9 +31,9 @@ function statSyncCached(path: string): IPathType { let stat; try { stat = fs.statSync(path, {throwIfNoEntry: false}); - } catch (e: any) { - if (!(e && (e.code === 'ENOENT' || e.code === 'ENOTDIR'))) { - throw e; + } catch (error: any) { + if (!(error && (error.code === 'ENOENT' || error.code === 'ENOTDIR'))) { + throw error; } } diff --git a/packages/jest-resolve/src/resolver.ts b/packages/jest-resolve/src/resolver.ts index 732aa15b127b..13a724e011b0 100644 --- a/packages/jest-resolve/src/resolver.ts +++ b/packages/jest-resolve/src/resolver.ts @@ -130,10 +130,10 @@ export default class Resolver { paths: paths ? (nodePaths || []).concat(paths) : nodePaths, rootDir: options.rootDir, }); - } catch (e) { + } catch (error) { // we always wanna throw if it's an internal import if (options.throwIfNotFound || path.startsWith('#')) { - throw e; + throw error; } } return null; @@ -174,10 +174,10 @@ export default class Resolver { rootDir: options.rootDir, }); return result; - } catch (e: unknown) { + } catch (error: unknown) { // we always wanna throw if it's an internal import if (options.throwIfNotFound || path.startsWith('#')) { - throw e; + throw error; } } return null; diff --git a/packages/jest-runner/src/runTest.ts b/packages/jest-runner/src/runTest.ts index ca3317d7ce3e..7e9f774e8aff 100644 --- a/packages/jest-runner/src/runTest.ts +++ b/packages/jest-runner/src/runTest.ts @@ -311,11 +311,11 @@ async function runTestInternal( path, sendMessageToJest, ); - } catch (err: any) { + } catch (error: any) { // Access stack before uninstalling sourcemaps - err.stack; + error.stack; - throw err; + throw error; } finally { if (collectV8Coverage) { await runtime.stopCollectingV8Coverage(); diff --git a/packages/jest-runtime/src/__tests__/Runtime-sourceMaps.test.js b/packages/jest-runtime/src/__tests__/Runtime-sourceMaps.test.js index c3efa3e94e46..9da732708a2e 100644 --- a/packages/jest-runtime/src/__tests__/Runtime-sourceMaps.test.js +++ b/packages/jest-runtime/src/__tests__/Runtime-sourceMaps.test.js @@ -26,13 +26,13 @@ describe('Runtime', () => { try { sum(); - } catch (err) { + } catch (error) { if (process.platform === 'win32') { - expect(err.stack).toMatch( + expect(error.stack).toMatch( /^Error: throwing fn\s+at sum.+\\__tests__\\test_root\\sourcemaps\\(out\\)?throwing-mapped-fn.js:\d+:\d+/, ); } else { - expect(err.stack).toMatch( + expect(error.stack).toMatch( /^Error: throwing fn\s+at sum.+\/__tests__\/test_root\/sourcemaps\/(out\/)?throwing-mapped-fn.js:\d+:\d+/, ); } diff --git a/packages/jest-runtime/src/__tests__/runtime_environment.test.js b/packages/jest-runtime/src/__tests__/runtime_environment.test.js index 5ad2780deced..37410e07cf31 100644 --- a/packages/jest-runtime/src/__tests__/runtime_environment.test.js +++ b/packages/jest-runtime/src/__tests__/runtime_environment.test.js @@ -21,9 +21,9 @@ describe('Runtime', () => { let hasThrown = false; try { runtime.requireModule(runtime.__mockRootPath, './throwing.js'); - } catch (err) { + } catch (error) { hasThrown = true; - expect(err.stack).toMatch(/^Error: throwing\s+at Object./); + expect(error.stack).toMatch(/^Error: throwing\s+at Object./); } expect(hasThrown).toBe(true); }); @@ -38,14 +38,14 @@ describe('Runtime', () => { try { sum(); - } catch (err) { + } catch (error) { hasThrown = true; if (process.platform === 'win32') { - expect(err.stack).toMatch( + expect(error.stack).toMatch( /^Error: throwing fn\s+at sum.+\\__tests__\\test_root\\throwing_fn\.js/, ); } else { - expect(err.stack).toMatch( + expect(error.stack).toMatch( /^Error: throwing fn\s+at sum.+\/__tests__\/test_root\/throwing_fn\.js/, ); } diff --git a/packages/jest-runtime/src/__tests__/runtime_require_mock.test.js b/packages/jest-runtime/src/__tests__/runtime_require_mock.test.js index da08c691e647..aa7de537ce52 100644 --- a/packages/jest-runtime/src/__tests__/runtime_require_mock.test.js +++ b/packages/jest-runtime/src/__tests__/runtime_require_mock.test.js @@ -89,8 +89,8 @@ describe('Runtime', () => { // are not correctly falling back to 'native' require. try { runtime.requireMock(__filename, './test_root/NativeModule.node'); - } catch (e) { - error = e; + } catch (thrownError) { + error = thrownError; } finally { expect(error.message).toMatch( /NativeModule.node: file too short|NativeModule.node, 0x0001|not a valid Win\d+ application/, diff --git a/packages/jest-runtime/src/index.ts b/packages/jest-runtime/src/index.ts index 131f0422baca..c5d1e2cb9c11 100644 --- a/packages/jest-runtime/src/index.ts +++ b/packages/jest-runtime/src/index.ts @@ -1153,8 +1153,8 @@ export default class Runtime { } else { return this.requireModule(from, moduleName); } - } catch (e) { - const moduleNotFound = Resolver.tryCastModuleNotFoundError(e); + } catch (error) { + const moduleNotFound = Resolver.tryCastModuleNotFoundError(error); if (moduleNotFound) { if ( moduleNotFound.siblingWithSimilarExtensionFound === null || @@ -1172,7 +1172,7 @@ export default class Runtime { moduleNotFound.buildMessage(this._config.rootDir); throw moduleNotFound; } - throw e; + throw error; } } @@ -1477,13 +1477,13 @@ export default class Runtime { try { return this._resolveCjsModule(from, moduleName); - } catch (err) { + } catch (error) { const module = this._resolver.getMockModule(from, moduleName); if (module) { return module; } else { - throw err; + throw error; } } } @@ -1720,8 +1720,8 @@ export default class Runtime { return this.linkAndEvaluateModule(module); }, }); - } catch (e: any) { - throw handlePotentialSyntaxError(e); + } catch (error: any) { + throw handlePotentialSyntaxError(error); } } @@ -1946,13 +1946,13 @@ export default class Runtime { let modulePath; try { modulePath = this._resolveCjsModule(from, moduleName); - } catch (e) { + } catch (error) { const manualMock = this._resolver.getMockModule(from, moduleName); if (manualMock) { this._shouldMockModuleCache.set(moduleID, true); return true; } - throw e; + throw error; } if (this._unmockList && this._unmockList.test(modulePath)) { @@ -2017,7 +2017,7 @@ export default class Runtime { let modulePath; try { modulePath = await this._resolveModule(from, moduleName); - } catch (e) { + } catch (error) { const manualMock = await this._resolver.getMockModuleAsync( from, moduleName, @@ -2026,7 +2026,7 @@ export default class Runtime { this._shouldMockModuleCache.set(moduleID, true); return true; } - throw e; + throw error; } if (this._unmockList && this._unmockList.test(modulePath)) { diff --git a/packages/jest-snapshot/src/index.ts b/packages/jest-snapshot/src/index.ts index 75d4c9290581..b6859cd3605e 100644 --- a/packages/jest-snapshot/src/index.ts +++ b/packages/jest-snapshot/src/index.ts @@ -514,8 +514,8 @@ const _toThrowErrorMatchingSnapshot = ( } else { try { received(); - } catch (e) { - error = e; + } catch (receivedError) { + error = receivedError; } } diff --git a/packages/jest-transform/src/ScriptTransformer.ts b/packages/jest-transform/src/ScriptTransformer.ts index f8afda252310..aa6b6fd29095 100644 --- a/packages/jest-transform/src/ScriptTransformer.ts +++ b/packages/jest-transform/src/ScriptTransformer.ts @@ -637,11 +637,11 @@ class ScriptTransformer { originalCode: content, sourceMapPath, }; - } catch (e) { - if (!(e instanceof Error)) { - throw e; + } catch (error) { + if (!(error instanceof Error)) { + throw error; } - throw handlePotentialSyntaxError(e); + throw handlePotentialSyntaxError(error); } } @@ -683,11 +683,11 @@ class ScriptTransformer { originalCode: content, sourceMapPath, }; - } catch (e) { - if (!(e instanceof Error)) { - throw e; + } catch (error) { + if (!(error instanceof Error)) { + throw error; } - throw handlePotentialSyntaxError(e); + throw handlePotentialSyntaxError(error); } } @@ -933,17 +933,17 @@ function readCodeCacheFile(cachePath: string): string | null { const writeCacheFile = (cachePath: string, fileData: string) => { try { writeFileAtomic(cachePath, fileData, {encoding: 'utf8', fsync: false}); - } catch (e) { - if (!(e instanceof Error)) { - throw e; + } catch (error) { + if (!(error instanceof Error)) { + throw error; } - if (cacheWriteErrorSafeToIgnore(e, cachePath)) { + if (cacheWriteErrorSafeToIgnore(error, cachePath)) { return; } - e.message = `jest: failed to cache transform results in: ${cachePath}\nFailure message: ${e.message}`; + error.message = `jest: failed to cache transform results in: ${cachePath}\nFailure message: ${error.message}`; removeFile(cachePath); - throw e; + throw error; } }; @@ -969,22 +969,22 @@ const readCacheFile = (cachePath: string): string | null => { let fileData; try { fileData = fs.readFileSync(cachePath, 'utf8'); - } catch (e) { - if (!(e instanceof Error)) { - throw e; + } catch (error) { + if (!(error instanceof Error)) { + throw error; } // on windows write-file-atomic is not atomic which can // result in this error if ( - (e as NodeJS.ErrnoException).code === 'ENOENT' && + (error as NodeJS.ErrnoException).code === 'ENOENT' && process.platform === 'win32' ) { return null; } - e.message = `jest: failed to read cache file: ${cachePath}\nFailure message: ${e.message}`; + error.message = `jest: failed to read cache file: ${cachePath}\nFailure message: ${error.message}`; removeFile(cachePath); - throw e; + throw error; } if (fileData == null) { diff --git a/packages/jest-util/src/createDirectory.ts b/packages/jest-util/src/createDirectory.ts index a4888fe434ed..58f4d6da91c2 100644 --- a/packages/jest-util/src/createDirectory.ts +++ b/packages/jest-util/src/createDirectory.ts @@ -10,9 +10,9 @@ import * as fs from 'graceful-fs'; export default function createDirectory(path: string): void { try { fs.mkdirSync(path, {recursive: true}); - } catch (e: any) { - if (e.code !== 'EEXIST') { - throw e; + } catch (error: any) { + if (error.code !== 'EEXIST') { + throw error; } } } diff --git a/packages/jest-util/src/createProcessObject.ts b/packages/jest-util/src/createProcessObject.ts index baa6916a64fe..59d67c0000c0 100644 --- a/packages/jest-util/src/createProcessObject.ts +++ b/packages/jest-util/src/createProcessObject.ts @@ -90,12 +90,12 @@ export default function createProcessObject(): typeof Process { try { // This fails on Node 12, but it's already set to 'process' newProcess[Symbol.toStringTag] = 'process'; - } catch (e: any) { + } catch (error: any) { // Make sure it's actually set instead of potentially ignoring errors if (newProcess[Symbol.toStringTag] !== 'process') { - e.message = `Unable to set toStringTag on process. Please open up an issue at https://github.com/jestjs/jest\n\n${e.message}`; + error.message = `Unable to set toStringTag on process. Please open up an issue at https://github.com/jestjs/jest\n\n${error.message}`; - throw e; + throw error; } } diff --git a/packages/jest-worker/src/__tests__/Farm.test.ts b/packages/jest-worker/src/__tests__/Farm.test.ts index 799468660f14..4a2268fb7f5d 100644 --- a/packages/jest-worker/src/__tests__/Farm.test.ts +++ b/packages/jest-worker/src/__tests__/Farm.test.ts @@ -210,18 +210,18 @@ describe('Farm', () => { const farm = new Farm(4, callback); const promise = farm.doWork('car', 'plane'); - let error = null; + let thrownError = null; workerReply(0, new TypeError('Massively broken')); try { await promise; - } catch (err) { - error = err; + } catch (error) { + thrownError = error; } - expect(error).not.toBeNull(); - expect(error).toBeInstanceOf(TypeError); + expect(thrownError).not.toBeNull(); + expect(thrownError).toBeInstanceOf(TypeError); }); it('checks that once a sticked task finishes, next time is sent to that worker', async () => { diff --git a/packages/jest-worker/src/workers/ChildProcessWorker.ts b/packages/jest-worker/src/workers/ChildProcessWorker.ts index 1f0069d2b806..249cfb8abd88 100644 --- a/packages/jest-worker/src/workers/ChildProcessWorker.ts +++ b/packages/jest-worker/src/workers/ChildProcessWorker.ts @@ -237,8 +237,8 @@ export default class ChildProcessWorker this.state = WorkerStates.OUT_OF_MEMORY; } } - } catch (err) { - console.error('Error looking for out of memory crash', err); + } catch (error) { + console.error('Error looking for out of memory crash', error); } } diff --git a/packages/jest-worker/src/workers/NodeThreadsWorker.ts b/packages/jest-worker/src/workers/NodeThreadsWorker.ts index f9af942e71ce..111353f6c436 100644 --- a/packages/jest-worker/src/workers/NodeThreadsWorker.ts +++ b/packages/jest-worker/src/workers/NodeThreadsWorker.ts @@ -383,11 +383,11 @@ export default class ExperimentalWorker try { this._worker.postMessage([CHILD_MESSAGE_MEM_USAGE]); - } catch (err: any) { + } catch (error: any) { this._memoryUsagePromise = undefined; this._resolveMemoryUsage = undefined; - rejectCallback(err); + rejectCallback(error); } return promise; diff --git a/packages/jest-worker/src/workers/processChild.ts b/packages/jest-worker/src/workers/processChild.ts index f81c56983692..15728b5b877f 100644 --- a/packages/jest-worker/src/workers/processChild.ts +++ b/packages/jest-worker/src/workers/processChild.ts @@ -193,8 +193,8 @@ function execFunction( try { result = fn.apply(ctx, args); - } catch (err: any) { - onError(err); + } catch (error: any) { + onError(error); return; } diff --git a/packages/jest-worker/src/workers/threadChild.ts b/packages/jest-worker/src/workers/threadChild.ts index 6b922f6fa285..e134615308d3 100644 --- a/packages/jest-worker/src/workers/threadChild.ts +++ b/packages/jest-worker/src/workers/threadChild.ts @@ -114,11 +114,11 @@ function reportSuccess(result: unknown) { try { parentPort!.postMessage([PARENT_MESSAGE_OK, result]); - } catch (err: any) { + } catch (error: any) { // Handling it here to avoid unhandled `DataCloneError` rejection // which is hard to distinguish on the parent side // (such error doesn't have any message or stack trace) - reportClientError(err); + reportClientError(error); } } @@ -202,8 +202,8 @@ function execFunction( try { result = fn.apply(ctx, args); - } catch (err: any) { - onError(err); + } catch (error: any) { + onError(error); return; } diff --git a/packages/pretty-format/__benchmarks__/test.js b/packages/pretty-format/__benchmarks__/test.js index 9ed3af893d1b..97a74d820224 100644 --- a/packages/pretty-format/__benchmarks__/test.js +++ b/packages/pretty-format/__benchmarks__/test.js @@ -29,8 +29,8 @@ function testCase(name, fn) { try { result = fn(); - } catch (err) { - error = err; + } catch (thrownError) { + error = thrownError; } if (!error) { diff --git a/scripts/buildTs.mjs b/scripts/buildTs.mjs index 2a49d08cbae4..191da7feb6dc 100644 --- a/scripts/buildTs.mjs +++ b/scripts/buildTs.mjs @@ -164,11 +164,11 @@ try { console.log( chalk.inverse.green(' Successfully built TypeScript definition files '), ); -} catch (e) { +} catch (error) { console.error( chalk.inverse.red(' Unable to build TypeScript definition files '), ); - throw e; + throw error; } console.log(chalk.inverse(' Validating TypeScript definition files ')); @@ -247,12 +247,12 @@ try { }), ), ); -} catch (e) { +} catch (error) { console.error( chalk.inverse.red(' Unable to validate TypeScript definition files '), ); - throw e; + throw error; } console.log( diff --git a/scripts/lintTs.mjs b/scripts/lintTs.mjs index f6a0a090a42e..59dc3fa48028 100644 --- a/scripts/lintTs.mjs +++ b/scripts/lintTs.mjs @@ -174,12 +174,12 @@ try { }), ), ); -} catch (e) { +} catch (error) { console.error( chalk.inverse.red(' Unable to lint using TypeScript info files '), ); - throw e; + throw error; } if (allLintResults.length > 0) { diff --git a/website/fetchSupporters.js b/website/fetchSupporters.js index 9abcaf611891..20ea90cd090b 100644 --- a/website/fetchSupporters.js +++ b/website/fetchSupporters.js @@ -49,7 +49,7 @@ request('https://api.opencollective.com/graphql/v2', graphqlQuery) .then(() => { console.log('Fetched 1 file: backers.json'); }) - .catch(e => { - console.error('Failed to write backers file:', e); + .catch(error => { + console.error('Failed to write backers file:', error); process.exitCode = 1; }); diff --git a/website/versioned_docs/version-29.4/TestingAsyncCode.md b/website/versioned_docs/version-29.4/TestingAsyncCode.md index 87c4e9c4ec03..ef7a51375265 100644 --- a/website/versioned_docs/version-29.4/TestingAsyncCode.md +++ b/website/versioned_docs/version-29.4/TestingAsyncCode.md @@ -33,8 +33,8 @@ test('the fetch fails with an error', async () => { expect.assertions(1); try { await fetchData(); - } catch (e) { - expect(e).toMatch('error'); + } catch (error) { + expect(error).toMatch('error'); } }); ``` @@ -64,7 +64,7 @@ If you expect a promise to be rejected, use the `.catch` method. Make sure to ad ```js test('the fetch fails with an error', () => { expect.assertions(1); - return fetchData().catch(e => expect(e).toMatch('error')); + return fetchData().catch(error => expect(error).toMatch('error')); }); ``` diff --git a/website/versioned_docs/version-29.4/TutorialAsync.md b/website/versioned_docs/version-29.4/TutorialAsync.md index 43618511429b..0a7e17cdeb16 100644 --- a/website/versioned_docs/version-29.4/TutorialAsync.md +++ b/website/versioned_docs/version-29.4/TutorialAsync.md @@ -114,8 +114,8 @@ Errors can be handled using the `.catch` method. Make sure to add `expect.assert // Testing for async errors using Promise.catch. it('tests error with promises', () => { expect.assertions(1); - return user.getUserName(2).catch(e => - expect(e).toEqual({ + return user.getUserName(2).catch(error => + expect(error).toEqual({ error: 'User with 2 not found.', }), ); @@ -126,8 +126,8 @@ it('tests error with async/await', async () => { expect.assertions(1); try { await user.getUserName(1); - } catch (e) { - expect(e).toEqual({ + } catch (error) { + expect(error).toEqual({ error: 'User with 1 not found.', }); } diff --git a/website/versioned_docs/version-29.5/TestingAsyncCode.md b/website/versioned_docs/version-29.5/TestingAsyncCode.md index 87c4e9c4ec03..ef7a51375265 100644 --- a/website/versioned_docs/version-29.5/TestingAsyncCode.md +++ b/website/versioned_docs/version-29.5/TestingAsyncCode.md @@ -33,8 +33,8 @@ test('the fetch fails with an error', async () => { expect.assertions(1); try { await fetchData(); - } catch (e) { - expect(e).toMatch('error'); + } catch (error) { + expect(error).toMatch('error'); } }); ``` @@ -64,7 +64,7 @@ If you expect a promise to be rejected, use the `.catch` method. Make sure to ad ```js test('the fetch fails with an error', () => { expect.assertions(1); - return fetchData().catch(e => expect(e).toMatch('error')); + return fetchData().catch(error => expect(error).toMatch('error')); }); ``` diff --git a/website/versioned_docs/version-29.5/TutorialAsync.md b/website/versioned_docs/version-29.5/TutorialAsync.md index 43618511429b..0a7e17cdeb16 100644 --- a/website/versioned_docs/version-29.5/TutorialAsync.md +++ b/website/versioned_docs/version-29.5/TutorialAsync.md @@ -114,8 +114,8 @@ Errors can be handled using the `.catch` method. Make sure to add `expect.assert // Testing for async errors using Promise.catch. it('tests error with promises', () => { expect.assertions(1); - return user.getUserName(2).catch(e => - expect(e).toEqual({ + return user.getUserName(2).catch(error => + expect(error).toEqual({ error: 'User with 2 not found.', }), ); @@ -126,8 +126,8 @@ it('tests error with async/await', async () => { expect.assertions(1); try { await user.getUserName(1); - } catch (e) { - expect(e).toEqual({ + } catch (error) { + expect(error).toEqual({ error: 'User with 1 not found.', }); } diff --git a/website/versioned_docs/version-29.6/TestingAsyncCode.md b/website/versioned_docs/version-29.6/TestingAsyncCode.md index 87c4e9c4ec03..ef7a51375265 100644 --- a/website/versioned_docs/version-29.6/TestingAsyncCode.md +++ b/website/versioned_docs/version-29.6/TestingAsyncCode.md @@ -33,8 +33,8 @@ test('the fetch fails with an error', async () => { expect.assertions(1); try { await fetchData(); - } catch (e) { - expect(e).toMatch('error'); + } catch (error) { + expect(error).toMatch('error'); } }); ``` @@ -64,7 +64,7 @@ If you expect a promise to be rejected, use the `.catch` method. Make sure to ad ```js test('the fetch fails with an error', () => { expect.assertions(1); - return fetchData().catch(e => expect(e).toMatch('error')); + return fetchData().catch(error => expect(error).toMatch('error')); }); ``` diff --git a/website/versioned_docs/version-29.6/TutorialAsync.md b/website/versioned_docs/version-29.6/TutorialAsync.md index 43618511429b..0a7e17cdeb16 100644 --- a/website/versioned_docs/version-29.6/TutorialAsync.md +++ b/website/versioned_docs/version-29.6/TutorialAsync.md @@ -114,8 +114,8 @@ Errors can be handled using the `.catch` method. Make sure to add `expect.assert // Testing for async errors using Promise.catch. it('tests error with promises', () => { expect.assertions(1); - return user.getUserName(2).catch(e => - expect(e).toEqual({ + return user.getUserName(2).catch(error => + expect(error).toEqual({ error: 'User with 2 not found.', }), ); @@ -126,8 +126,8 @@ it('tests error with async/await', async () => { expect.assertions(1); try { await user.getUserName(1); - } catch (e) { - expect(e).toEqual({ + } catch (error) { + expect(error).toEqual({ error: 'User with 1 not found.', }); } diff --git a/website/versioned_docs/version-29.7/TestingAsyncCode.md b/website/versioned_docs/version-29.7/TestingAsyncCode.md index 87c4e9c4ec03..ef7a51375265 100644 --- a/website/versioned_docs/version-29.7/TestingAsyncCode.md +++ b/website/versioned_docs/version-29.7/TestingAsyncCode.md @@ -33,8 +33,8 @@ test('the fetch fails with an error', async () => { expect.assertions(1); try { await fetchData(); - } catch (e) { - expect(e).toMatch('error'); + } catch (error) { + expect(error).toMatch('error'); } }); ``` @@ -64,7 +64,7 @@ If you expect a promise to be rejected, use the `.catch` method. Make sure to ad ```js test('the fetch fails with an error', () => { expect.assertions(1); - return fetchData().catch(e => expect(e).toMatch('error')); + return fetchData().catch(error => expect(error).toMatch('error')); }); ``` diff --git a/website/versioned_docs/version-29.7/TutorialAsync.md b/website/versioned_docs/version-29.7/TutorialAsync.md index 43618511429b..0a7e17cdeb16 100644 --- a/website/versioned_docs/version-29.7/TutorialAsync.md +++ b/website/versioned_docs/version-29.7/TutorialAsync.md @@ -114,8 +114,8 @@ Errors can be handled using the `.catch` method. Make sure to add `expect.assert // Testing for async errors using Promise.catch. it('tests error with promises', () => { expect.assertions(1); - return user.getUserName(2).catch(e => - expect(e).toEqual({ + return user.getUserName(2).catch(error => + expect(error).toEqual({ error: 'User with 2 not found.', }), ); @@ -126,8 +126,8 @@ it('tests error with async/await', async () => { expect.assertions(1); try { await user.getUserName(1); - } catch (e) { - expect(e).toEqual({ + } catch (error) { + expect(error).toEqual({ error: 'User with 1 not found.', }); }