From 213634d7021f646ad9bc2e18f43dfef0d05d6e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Tue, 12 Sep 2017 03:31:41 +0200 Subject: [PATCH] Expose restoreAllMocks to object (#4463) --- packages/jest-runtime/src/index.js | 11 +++++------ types/Jest.js | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/jest-runtime/src/index.js b/packages/jest-runtime/src/index.js index 314a9be864d9..de418865011a 100644 --- a/packages/jest-runtime/src/index.js +++ b/packages/jest-runtime/src/index.js @@ -716,6 +716,10 @@ class Runtime { this.resetAllMocks(); return jestObject; }; + const restoreAllMocks = () => { + this.restoreAllMocks(); + return jestObject; + }; const useFakeTimers = () => { this._environment.fakeTimers.useFakeTimers(); return jestObject; @@ -743,7 +747,6 @@ class Runtime { const jestObject = { addMatchers: (matchers: Object) => this._environment.global.jasmine.addMatchers(matchers), - autoMockOff: disableAutomock, autoMockOn: enableAutomock, clearAllMocks, @@ -759,14 +762,13 @@ class Runtime { this._generateMock(from, moduleName), genMockFunction: fn, isMockFunction: this._moduleMocker.isMockFunction, - mock, requireActual: localRequire.requireActual, requireMock: localRequire.requireMock, resetAllMocks, resetModuleRegistry: resetModules, resetModules, - + restoreAllMocks, runAllImmediates: () => this._environment.fakeTimers.runAllImmediates(), runAllTicks: () => this._environment.fakeTimers.runAllTicks(), runAllTimers: () => this._environment.fakeTimers.runAllTimers(), @@ -774,14 +776,11 @@ class Runtime { this._environment.fakeTimers.runOnlyPendingTimers(), runTimersToTime: (msToRun: number) => this._environment.fakeTimers.runTimersToTime(msToRun), - setMock: (moduleName: string, mock: Object) => setMockFactory(moduleName, () => mock), setTimeout, spyOn, - unmock, - useFakeTimers, useRealTimers, }; diff --git a/types/Jest.js b/types/Jest.js index c5c65e6d69d2..3d726ec40f2e 100644 --- a/types/Jest.js +++ b/types/Jest.js @@ -35,6 +35,7 @@ export type Jest = {| resetAllMocks(): Jest, resetModuleRegistry(): Jest, resetModules(): Jest, + restoreAllMocks(): Jest, runAllImmediates(): void, runAllTicks(): void, runAllTimers(): void,