Merge pull request #1 from teddyzeenny/recursive-self-resolution

Fix infinite recursion with deep self fulfilling promises

browser/rsvp/promise.amd.js

@@ -119,7 +119,11 @@ define(
         fulfill(promise, value);
       } else if (objectOrFunction(value) && isFunction(value.then)) {
         value.then(function(val) {
-          resolve(promise, val);
+          if (value !== val) {
+            resolve(promise, val);
+          } else {
+            fulfill(promise, val);
+          }
         }, function(val) {
           reject(promise, val);
         });

lib/rsvp/promise.js

@@ -115,7 +115,11 @@ function resolve(promise, value) {
     fulfill(promise, value);
   } else if (objectOrFunction(value) && isFunction(value.then)) {
     value.then(function(val) {
-      resolve(promise, val);
+      if (value !== val) {
+        resolve(promise, val);
+      } else {
+        fulfill(promise, val);
+      }
     }, function(val) {
       reject(promise, val);
     });

tests/extension-tests.js

@@ -134,6 +134,27 @@ describe("RSVP extensions", function() {
         });
       });
 
+
+      it('should assimilate two levels deep, for fulfillment of self fulfilling promises', function(done) {
+        var originalPromise, promise;
+        originalPromise = new RSVP.Promise(function(resolve) {
+          setTimeout(function() {
+            resolve(originalPromise);
+          }, 0)
+        });
+
+        promise = new RSVP.Promise(function(resolve) {
+          setTimeout(function() {
+            resolve(originalPromise);
+          }, 0);
+        });
+
+        promise.then(function(value) {
+          assert.equal(value, originalPromise);
+          done();
+        });
+      });
+
       it('should assimilate two levels deep, for fulfillment', function(done) {
         var originalPromise = new RSVP.Promise(function(resolve) { resolve('original value'); });
         var nextPromise = new RSVP.Promise(function(resolve) { resolve(originalPromise); });