From d4ac3a53a7ea2e8e4e975c4ea0e3e052d5a34b41 Mon Sep 17 00:00:00 2001
From: antoinebrault <antoinebrault@gmail.com>
Date: Fri, 8 Feb 2019 22:27:03 -0500
Subject: [PATCH] move custom types to jest namespace

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

diff --git a/types/jest-when/index.d.ts b/types/jest-when/index.d.ts
index 1d1c83b206..9a9fb9a55f 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: 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>;
+  mockResolvedValue(value: jest.ResolvedValue<T>): WhenMock<T, Y>;
+  mockResolvedValueOnce(value: jest.ResolvedValue<T>): WhenMock<T, Y>;
+  mockRejectedValue(value: jest.RejectedValue<T>): WhenMock<T, Y>;
+  mockRejectedValueOnce(value: jest.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 f342f27580..840d9b7fa0 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -36,10 +36,6 @@ 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 {
     /**
      * Returns the actual module instead of a mock, bypassing all checks on
@@ -239,6 +235,9 @@ declare namespace jest {
     }
 
     type EmptyFunction = () => void;
+    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 DoneCallback {
         (...args: any[]): any;