From 920c290ae36adcea961c6ceac1d93e24e0c80fba Mon Sep 17 00:00:00 2001
From: Igor Oleinikov <igor@oleinikov.ru>
Date: Tue, 18 Mar 2014 10:46:14 +0400
Subject: [PATCH] Fixed definition for Rx.config.Promise; Added test for
 promises;

---
 rx.js/rx.async-tests.ts | 4 ++++
 rx.js/rx.d.ts           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rx.js/rx.async-tests.ts b/rx.js/rx.async-tests.ts
index b71f8bd77..9403c7517 100644
--- a/rx.js/rx.async-tests.ts
+++ b/rx.js/rx.async-tests.ts
@@ -66,8 +66,12 @@ module Rx.Tests.Async {
 			new<T>(resolver: (resolvePromise: (value: T)=> void, rejectPromise: (reason: any)=> void)=> void): Rx.IPromise<T>;
 		};
 
+		Rx.config.Promise = promiseImpl;
+
 		var p: IPromise<number> = obsNum.toPromise(promiseImpl);
 
+		p = obsNum.toPromise();
+
 		p = p.then(x=> x);
 		p = p.then(x=> p);
 		p = p.then(undefined, reason=> 10);
diff --git a/rx.js/rx.d.ts b/rx.js/rx.d.ts
index 2b9a68dc9..d0dc1eda3 100644
--- a/rx.js/rx.d.ts
+++ b/rx.js/rx.d.ts
@@ -47,7 +47,7 @@ declare module Rx {
 	}
 
 	export module config {
-		export var Promise: { new <T>(resolve: (value: T) => void, reject: (reason: any) => void): IPromise<T>; };
+		export var Promise: { new <T>(resolver: (resolvePromise: (value: T) => void, rejectPromise: (reason: any) => void) => void): IPromise<T>; };
 	}
 
 	export interface IDisposable {