From d08c35d4108d7bbeaacd91765bcf4d39e8da5130 Mon Sep 17 00:00:00 2001 From: Kunal Kushwaha Date: Tue, 28 Jul 2020 16:13:12 +0530 Subject: [PATCH] removed the UNSTABLE_prefix & resolved usages --- packages/jest-runner/src/index.ts | 29 +++++++++++--------------- packages/jest-runner/src/runTest.ts | 2 +- packages/jest-runner/src/testWorker.ts | 2 +- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/packages/jest-runner/src/index.ts b/packages/jest-runner/src/index.ts index e4c49a1dbef9..95b3f1100d03 100644 --- a/packages/jest-runner/src/index.ts +++ b/packages/jest-runner/src/index.ts @@ -49,7 +49,7 @@ namespace TestRunner { class TestRunner { private readonly _globalConfig: Config.GlobalConfig; private readonly _context: JestTestRunnerContext; - private readonly UNSTABLE_eventEmitter = new Emittery.Typed(); + private readonly eventEmitter = new Emittery.Typed(); readonly __PRIVATE_UNSTABLE_API_supportsEventEmitters__: boolean = true; readonly isSerial?: boolean; @@ -109,27 +109,25 @@ class TestRunner { this._globalConfig, test.context.config, test.context.resolver, - undefined, this._context, + undefined, ); } else { // `deepCyclicCopy` used here to avoid mem-leak sendMessageToJest = (eventName, args) => - this.UNSTABLE_eventEmitter.emit( + this.eventEmitter.emit( eventName, deepCyclicCopy(args, {keepPrototype: false}), ); - await this.UNSTABLE_eventEmitter.emit('test-file-start', [ - test, - ]); + await this.eventEmitter.emit('test-file-start', [test]); return runTest( test.path, this._globalConfig, test.context.config, test.context.resolver, - sendMessageToJest, this._context, + sendMessageToJest, ); } }) @@ -137,7 +135,7 @@ class TestRunner { if (onResult) { return onResult(test, result); } else { - return this.UNSTABLE_eventEmitter.emit('test-file-success', [ + return this.eventEmitter.emit('test-file-success', [ test, result, ]); @@ -147,10 +145,7 @@ class TestRunner { if (onFailure) { return onFailure(test, err); } else { - return this.UNSTABLE_eventEmitter.emit('test-file-failure', [ - test, - err, - ]); + return this.eventEmitter.emit('test-file-failure', [test, err]); } }), ), @@ -204,7 +199,7 @@ class TestRunner { if (onStart) { await onStart(test); } else { - await this.UNSTABLE_eventEmitter.emit('test-file-start', [test]); + await this.eventEmitter.emit('test-file-start', [test]); } const promise = worker.worker({ @@ -225,7 +220,7 @@ class TestRunner { if (promise.UNSTABLE_onCustomMessage) { // TODO: Get appropriate type for `onCustomMessage` promise.UNSTABLE_onCustomMessage(([event, payload]: any) => { - this.UNSTABLE_eventEmitter.emit(event, payload); + this.eventEmitter.emit(event, payload); }); } @@ -237,7 +232,7 @@ class TestRunner { if (onFailure) { await onFailure(test, err); } else { - await this.UNSTABLE_eventEmitter.emit('test-file-failure', [test, err]); + await this.eventEmitter.emit('test-file-failure', [test, err]); } if (err.type === 'ProcessTerminatedError') { console.error( @@ -263,7 +258,7 @@ class TestRunner { if (onResult) { return onResult(test, result); } else { - return this.UNSTABLE_eventEmitter.emit('test-file-success', [ + return this.eventEmitter.emit('test-file-success', [ test, result, ]); @@ -288,7 +283,7 @@ class TestRunner { return Promise.race([runAllTests, onInterrupt]).then(cleanup, cleanup); } - on = this.UNSTABLE_eventEmitter.on.bind(this.UNSTABLE_eventEmitter); + on = this.eventEmitter.on.bind(this.eventEmitter); } class CancelRun extends Error { diff --git a/packages/jest-runner/src/runTest.ts b/packages/jest-runner/src/runTest.ts index 4d05ea1ff50a..390e0897cf66 100644 --- a/packages/jest-runner/src/runTest.ts +++ b/packages/jest-runner/src/runTest.ts @@ -314,8 +314,8 @@ export default async function runTest( globalConfig: Config.GlobalConfig, config: Config.ProjectConfig, resolver: ResolverType, - sendMessageToJest?: TestFileEvent, context?: TestRunnerContext, + sendMessageToJest?: TestFileEvent, ): Promise { const {leakDetector, result} = await runTestInternal( path, diff --git a/packages/jest-runner/src/testWorker.ts b/packages/jest-runner/src/testWorker.ts index d1b35875a0ac..10e2e3e0b318 100644 --- a/packages/jest-runner/src/testWorker.ts +++ b/packages/jest-runner/src/testWorker.ts @@ -96,7 +96,6 @@ export async function worker({ globalConfig, config, getResolver(config), - sendMessageToJest, context && { ...context, changedFiles: context.changedFiles && new Set(context.changedFiles), @@ -104,6 +103,7 @@ export async function worker({ context.sourcesRelatedToTestsInChangedFiles && new Set(context.sourcesRelatedToTestsInChangedFiles), }, + sendMessageToJest, ); } catch (error) { throw formatError(error);