Rename Promise.cast to Promise.resolve; remove old Promise.resolve.

As resolved in Jan 30, 2014 ES6 meeting: https://github.com/rwaldron/tc39-notes/blob/master/es6/2014-01/jan-30.md#conclusionresolution-3
paulmillr · Feb 14, 2014 · 99c8d79 · 99c8d79
1 parent a06e548
commit 99c8d79
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/es6-shim.js b/es6-shim.js
@@ -1190,7 +1190,7 @@
             if (next.done) {
               break;
             }
-            var nextPromise = C.cast(next.value);
+            var nextPromise = C.resolve(next.value);
             var resolveElement = _promiseAllResolver(
               index, values, capability, remaining
             );
@@ -1206,18 +1206,6 @@
         return capability.promise;
       };
 
-      Promise.cast = function(x) {
-        var C = this;
-        if (ES.IsPromise(x)) {
-          var constructor = x._promiseConstructor;
-          if (constructor === C) { return x; }
-        }
-        var capability = new PromiseCapability(C);
-        var resolve = capability.resolve;
-        resolve(x); // call with this===undefined
-        return capability.promise;
-      };
-
       Promise.race = function(iterable) {
         var C = this;
         var capability = new PromiseCapability(C);
@@ -1237,7 +1225,7 @@
               // https://bugs.ecmascript.org/show_bug.cgi?id=2515
               break;
             }
-            var nextPromise = C.cast(next.value);
+            var nextPromise = C.resolve(next.value);
             nextPromise.then(resolve, reject);
           }
         } catch (e) {
@@ -1256,6 +1244,10 @@
 
       Promise.resolve = function(v) {
         var C = this;
+        if (ES.IsPromise(v)) {
+          var constructor = v._promiseConstructor;
+          if (constructor === C) { return v; }
+        }
         var capability = new PromiseCapability(C);
         var resolve = capability.resolve;
         resolve(v); // call with this===undefined

diff --git a/test/promise/all.js b/test/promise/all.js
@@ -179,7 +179,7 @@ describe("Promise.all", function () {
     P.__proto__ = Promise;
     P.prototype = Object.create(Promise.prototype);
     P.prototype.constructor = P;
-    P.cast = function(p) { return p; };
+    P.resolve = function(p) { return p; };
 
     var g = [
       Promise.resolve(0),

diff --git a/test/promise/evil-promises.js b/test/promise/evil-promises.js
@@ -5,7 +5,15 @@ var assert = require("assert");
 
 describe("Evil promises should not be able to break invariants", function () {
   specify("resolving to a promise that calls onFulfilled twice", function (done) {
-    var evilPromise = Promise.resolve();
+    // note that we have to create a trivial subclass, as otherwise the
+    // Promise.resolve(evilPromise) is just the identity function.
+    var EvilPromise = function(executor) { Promise.call(this, executor); };
+    if (!EvilPromise.__proto__) { return; } // skip test if on IE < 11
+    EvilPromise.__proto__ = Promise; // mutable __proto__ is in es6.
+    EvilPromise.prototype = Object.create(Promise.prototype);
+    EvilPromise.prototype.constructor = EvilPromise;
+
+    var evilPromise = EvilPromise.resolve();
     evilPromise.then = function (f) {
       f(1);
       f(2);