From a44c7d653b04b19477181c62fa80e6c823060ee0 Mon Sep 17 00:00:00 2001
From: Kenneth Kouot <kenneth@wikia-inc.com>
Date: Thu, 3 Jul 2014 13:45:42 -0700
Subject: [PATCH 1/3] ember-RSVP Add typing for Ember.RSVP.Promise constructor

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

diff --git a/ember/ember.d.ts b/ember/ember.d.ts
index 40d2f9859d..03bce98f7d 100644
--- a/ember/ember.d.ts
+++ b/ember/ember.d.ts
@@ -1501,6 +1501,7 @@ declare module Ember {
     }
     module RSVP {
         class Promise {
+			constructor(resolver: Function, label?: string);
             then(done?: Function, fail?: Function): Promise;
         }
     }

From 8e49b8e8c8ee4b197c2f4e972716227d253b11b4 Mon Sep 17 00:00:00 2001
From: Kenneth Kouot <kenneth@wikia-inc.com>
Date: Thu, 3 Jul 2014 13:50:55 -0700
Subject: [PATCH 2/3] Add tests for Ember.RSVP.Promise from Ember docs

---
 ember/ember-tests.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ember/ember-tests.ts b/ember/ember-tests.ts
index 254e1682c9..39e960e003 100644
--- a/ember/ember-tests.ts
+++ b/ember/ember-tests.ts
@@ -193,3 +193,18 @@ people2.some((person: Em.Object) => {
 });
 people2.everyProperty('isHappy', true);
 people2.someProperty('isHappy', true);
+
+// Examples taken from http://emberjs.com/api/classes/Ember.RSVP.Promise.html
+var promise = new Ember.RSVP.Promise(function(resolve, reject) {
+  // on success
+  resolve('ok!');
+
+  // on failure
+  reject('no-k!');
+});
+
+promise.then(function(value) {
+  // on fulfillment
+}, function(reason) {
+  // on rejection
+});

From 290d4da01002f6bf10cb74f9d9e482d70e02c368 Mon Sep 17 00:00:00 2001
From: Kenneth Kouot <kenneth@wikia-inc.com>
Date: Thu, 3 Jul 2014 13:53:34 -0700
Subject: [PATCH 3/3] tabs to spaces

---
 ember/ember.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ember/ember.d.ts b/ember/ember.d.ts
index 03bce98f7d..bbb555e8a6 100644
--- a/ember/ember.d.ts
+++ b/ember/ember.d.ts
@@ -1501,7 +1501,7 @@ declare module Ember {
     }
     module RSVP {
         class Promise {
-			constructor(resolver: Function, label?: string);
+            constructor(resolver: Function, label?: string);
             then(done?: Function, fail?: Function): Promise;
         }
     }