From 1f5d6d6cc4f6ff4446fcd18b7fd55cce627a4b22 Mon Sep 17 00:00:00 2001
From: antoinebrault <antoinebrault@gmail.com>
Date: Tue, 5 Feb 2019 21:47:22 -0500
Subject: [PATCH] fix jest-when

---
 types/jest-when/index.d.ts |  8 ++++----
 types/jest/index.d.ts      | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/types/jest-when/index.d.ts b/types/jest-when/index.d.ts
index 386911ed7c..1d1c83b206 100644
--- a/types/jest-when/index.d.ts
+++ b/types/jest-when/index.d.ts
@@ -11,10 +11,10 @@ export interface WhenMock<T = any, Y extends any[] = any> extends jest.Mock<T, Y
   expectCalledWith(...matchers: Y): WhenMock<T, Y>;
   mockReturnValue(value: T): WhenMock<T, Y>;
   mockReturnValueOnce(value: T): WhenMock<T, Y>;
-  mockResolvedValue(value: T | PromiseLike<T>): WhenMock<Promise<T>, Y>;
-  mockResolvedValueOnce(value: T | PromiseLike<T>): WhenMock<Promise<T>, Y>;
-  mockRejectedValue(value: T | PromiseLike<T>): WhenMock<Promise<T>, Y>;
-  mockRejectedValueOnce(value: T | PromiseLike<T>): WhenMock<Promise<T>, Y>;
+  mockResolvedValue(value: ResolvedValue<T>): WhenMock<T, Y>;
+  mockResolvedValueOnce(value: ResolvedValue<T>): WhenMock<T, Y>;
+  mockRejectedValue(value: RejectedValue<T>): WhenMock<T, Y>;
+  mockRejectedValueOnce(value: RejectedValue<T>): WhenMock<T, Y>;
 }
 
 export type When = <T, Y extends any[]>(fn: jest.Mock<T, Y>) => WhenMock<T, Y>;
diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 6cee72a6d1..f342f27580 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -37,6 +37,8 @@ declare var xtest: jest.It;
 declare const expect: jest.Expect;
 
 type ArgsType<T> = T extends (...args: infer A) => any ? A : never;
+type RejectedValue<T> = T extends PromiseLike<any> ? any : never;
+type ResolvedValue<T> = T extends PromiseLike<infer U> ? U | T : never;
 
 interface NodeRequire {
     /**
@@ -912,7 +914,7 @@ declare namespace jest {
         /**
          * Simple sugar function for: `jest.fn().mockImplementation(() => Promise.resolve(value));`
          */
-        mockResolvedValue(value: T extends PromiseLike<infer U> ? U | T : never): Mock<T, Y>;
+        mockResolvedValue(value: ResolvedValue<T>): Mock<T, Y>;
         /**
          * Simple sugar function for: `jest.fn().mockImplementationOnce(() => Promise.resolve(value));`
          *
@@ -932,7 +934,7 @@ declare namespace jest {
          * });
          *
          */
-        mockResolvedValueOnce(value: T extends PromiseLike<infer U> ? U | T : never): Mock<T, Y>;
+        mockResolvedValueOnce(value: ResolvedValue<T>): Mock<T, Y>;
         /**
          * Simple sugar function for: `jest.fn().mockImplementation(() => Promise.reject(value));`
          *
@@ -944,7 +946,7 @@ declare namespace jest {
          *   await asyncMock(); // throws "Async error"
          * });
          */
-        mockRejectedValue(value: T extends PromiseLike<any> ? any : never): Mock<T, Y>;
+        mockRejectedValue(value: RejectedValue<T>): Mock<T, Y>;
 
         /**
          * Simple sugar function for: `jest.fn().mockImplementationOnce(() => Promise.reject(value));`
@@ -962,7 +964,7 @@ declare namespace jest {
          * });
          *
          */
-        mockRejectedValueOnce(value: T extends PromiseLike<any> ? any : never): Mock<T, Y>;
+        mockRejectedValueOnce(value: RejectedValue<T>): Mock<T, Y>;
     }
 
     /**