From c58c60d89797e949a697d8b574cfde70c4002ec7 Mon Sep 17 00:00:00 2001
From: bfrengley <37278140+bfrengley@users.noreply.github.com>
Date: Tue, 11 Sep 2018 11:52:06 +1200
Subject: [PATCH] [@types/when] Restore parameterless when.resolve() and allow
 (#28593)

parameterless when()
---
 types/when/index.d.ts    | 2 ++
 types/when/when-tests.ts | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/types/when/index.d.ts b/types/when/index.d.ts
index 117c929cbe..b1f76056b8 100644
--- a/types/when/index.d.ts
+++ b/types/when/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Derek Cicerone <https://github.com/derekcicerone>, Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+declare function When(): When.Promise<void>;
 declare function When<T>(promiseOrValue: T | When.Promise<T> | When.Thenable<T>): When.Promise<T>;
 declare function When<T, U>(promiseOrValue: T | When.Promise<T> | When.Thenable<T>, transform: (val: T) => U): When.Promise<U>;
 
@@ -231,6 +232,7 @@ declare namespace When {
      *    - fulfilled with promiseOrValue's value after it is fulfilled
      *    - rejected with promiseOrValue's reason after it is rejected
      */
+    function resolve(): Promise<void>;
     function resolve<T>(promiseOrValue: T | Promise<T> | Thenable<T>): Promise<T>;
 
     interface Deferred<T> {
diff --git a/types/when/when-tests.ts b/types/when/when-tests.ts
index 416758aadb..0b5ceff183 100644
--- a/types/when/when-tests.ts
+++ b/types/when/when-tests.ts
@@ -32,6 +32,7 @@ class Data implements IData {
 
 var promise: when.Promise<number>;
 var promise2: when.Promise<Data>;
+var emptyPromise: when.Promise<void>;
 var foreign = new ForeignPromise<number>(1);
 var promiseOrValue = 1 as number | when.Promise<number>;
 var error = new Error("boom!");
@@ -42,6 +43,10 @@ var native: Promise<number>;
  *   Core    *
  * * * * * * */
 
+/* when() */
+
+emptyPromise = when();
+
 /* when(x) */
 
 promise = when(1);
@@ -202,6 +207,10 @@ when.unfold(function (x) {
 promise = when.promise<number>(resolve => resolve(5));
 promise = when.promise<number>((resolve, reject) => reject(error));
 
+/* when.resolve() */
+
+emptyPromise = when.resolve();
+
 /* when.resolve(x) */
 
 promise = when.resolve(1);