From a3a365d9297b19b4c94c55a85804f7879da75e62 Mon Sep 17 00:00:00 2001
From: Stephen Ierodiaconou <stevegeek@gmail.com>
Date: Wed, 23 Mar 2016 17:14:10 +0000
Subject: [PATCH 1/2] Update Q tests to include fact deferred can be resolved
 with a value or promise

As per the Q docs "Note that a deferred can be resolved with a value or a promise. "
---
 q/Q-tests.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/q/Q-tests.ts b/q/Q-tests.ts
index 025a92358..ab613f8aa 100644
--- a/q/Q-tests.ts
+++ b/q/Q-tests.ts
@@ -16,6 +16,10 @@ Q.when(delay(1000), function (val: void) {
     return;
 });
 
+// Note from Q documentation: a deferred can be resolved with a value or a promise.
+var otherPromise = Q.defer<string>().promise;
+Q.defer<string>().resolve(otherPromise);
+
 Q.timeout(Q(new Date()), 1000, "My dates never arrived. :(").then(d => d.toJSON());
 
 Q.delay(Q(8), 1000).then(x => x.toExponential());

From 904e8f5cd2f478ad951ed71fb8a1bd84ffdacf8c Mon Sep 17 00:00:00 2001
From: Stephen Ierodiaconou <stevegeek@gmail.com>
Date: Wed, 23 Mar 2016 17:14:52 +0000
Subject: [PATCH 2/2] A Q deferred can be resolved with a promise

---
 q/Q.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/q/Q.d.ts b/q/Q.d.ts
index c38e529cf..bd9cdb8ca 100644
--- a/q/Q.d.ts
+++ b/q/Q.d.ts
@@ -21,6 +21,7 @@ declare namespace Q {
     interface Deferred<T> {
         promise: Promise<T>;
         resolve(value?: T): void;
+        resolve(value?: IPromise<T>): void;
         reject(reason: any): void;
         notify(value: any): void;
         makeNodeResolver(): (reason: any, value: T) => void;