Promise-Aplus v2.0.3 WIP #1

Got 30~ tests passing in the 2.3.3 test suite
caitp · Dec 17, 2013 · d917880 · d917880
1 parent cbb3ce2
commit d917880
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 14 deletions.
diff --git a/lib/promises-aplus/promises-aplus-test-adapter.js b/lib/promises-aplus/promises-aplus-test-adapter.js
@@ -2,14 +2,8 @@ var isFunction = function isFunction(value){return typeof value == 'function';}
 
 var $q = qFactory(process.nextTick, function noopExceptionHandler() {});
 
-exports.fulfilled = $q.resolve;
+exports.resolved = $q.resolve;
 exports.rejected = $q.reject;
-exports.pending = function () {
-    var deferred = $q.defer();
-
-    return {
-        promise: deferred.promise,
-        fulfill: deferred.resolve,
-        reject: deferred.reject
-    };
+exports.deferred = function () {
+  return $q.defer();
 };
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "grunt-parallel": "~0.3.1",
     "grunt-ddescribe-iit": "~0.0.1",
     "grunt-merge-conflict": "~0.0.1",
-    "promises-aplus-tests": "~1.3.2",
+    "promises-aplus-tests": "~2.0.3",
     "grunt-shell": "~0.4.0",
     "semver": "~2.1.0",
     "lodash": "~2.1.0",

diff --git a/src/ng/q.js b/src/ng/q.js
@@ -204,6 +204,9 @@ function qFactory(nextTick, exceptionHandler) {
     deferred = {
 
       resolve: function(val) {
+        if (val === deferred) {
+          throw new TypeError();
+        }
         if (pending) {
           var callbacks = pending;
           pending = undefined;
@@ -214,7 +217,9 @@ function qFactory(nextTick, exceptionHandler) {
               var callback;
               for (var i = 0, ii = callbacks.length; i < ii; i++) {
                 callback = callbacks[i];
-                value.then(callback[0], callback[1], callback[2]);
+                if (typeof value.then === 'function') {
+                  value.then.call(value, callback[0], callback[1], callback[2]);
+                }
               }
             });
           }
@@ -223,6 +228,9 @@ function qFactory(nextTick, exceptionHandler) {
 
 
       reject: function(reason) {
+        if (reason === deferred || reason === deferred.promise) {
+          throw new TypeError();
+        }
         deferred.resolve(reject(reason));
       },
 
@@ -277,7 +285,7 @@ function qFactory(nextTick, exceptionHandler) {
           if (pending) {
             pending.push([wrappedCallback, wrappedErrback, wrappedProgressback]);
           } else {
-            value.then(wrappedCallback, wrappedErrback, wrappedProgressback);
+            value.then.call(value, wrappedCallback, wrappedErrback, wrappedProgressback);
           }
 
           return result.promise;
@@ -331,7 +339,16 @@ function qFactory(nextTick, exceptionHandler) {
 
 
   var ref = function(value) {
-    if (value && isFunction(value.then)) return value;
+    if (value && isFunction(value) || typeof value === 'object') {
+      var then;
+      try {
+        if (then = value.then && typeof then === 'function') {
+          return value;
+        }
+      } catch (e) {
+        return reject(e);
+      }
+    }
     return {
       then: function(callback) {
         var result = defer();
@@ -343,7 +360,6 @@ function qFactory(nextTick, exceptionHandler) {
     };
   };
 
-
   /**
    * @ngdoc
    * @name ng.$q#reject
@@ -380,6 +396,7 @@ function qFactory(nextTick, exceptionHandler) {
    * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
    */
   var reject = function(reason) {
+    console.log('reject', reason);
     return {
       then: function(callback, errback) {
         var result = defer();