rejectWhen: Support "signal" type

Author: benlau

QuickPromise/Promise.qml

@@ -56,7 +56,15 @@ QtObject {
     }
 
     function reject(reason) {
-        _promise.reject(reason);
+        if (_instanceOfSignal(reason)) {
+            var promise = Q.promise();
+            reason.connect(function() {
+                promise.reject();
+            });
+            _promise.resolve(promise);
+        } else {
+            _promise.reject(reason);
+        }
     }
 
     /// Combine multiple promises into a single promise.
@@ -101,7 +109,9 @@ QtObject {
     onRejectWhenChanged: {
         _init();
         if (rejectWhen === true) {
-            reject();
+            reject(true);
+        } else if (_instanceOfSignal(rejectWhen)) {
+            reject(rejectWhen);
         }
     }
 

README.md

@@ -138,11 +138,11 @@ Promise {
 
 resolveWhen property is an alternative method to call resolve() in QML way. You may bind a binary expression, another promise, signal to the "resolveWhen" property. It may trigger the resolve() depend on its type and value.
 
-*resolveWhen(binary expression)*
+*resolveWhen: binary expression*
 
 Once the expression become true, it will trigger resolve(true).
 
-*resolveWhen(signal)*
+*resolveWhen: signal*
 
 Listen the signal, once it is triggered, it will call resolve().
 
@@ -160,7 +160,7 @@ Promise {
 }
 ```
 
-*resolveWhen(promise)*
+*resolveWhen: promise*
 
 It is equivalent to resolve(promise). It will adopt the state from the input promise object.
 
@@ -172,6 +172,20 @@ If x is rejected, call reject().
 
 If x is not settled, listen its state change. Once it is triggered, repeat the above steps.
 
+**rejectWhen**
+
+_rejectWhen_ property is an alternative method to call reject() in QML way. You may bind a binary expression, signal to this property. It may trigger the reject() depend on its type and value.
+
+Remarks: _rejectWhen_ can not take promise as parameter
+
+*rejectWhen: binary expression*
+
+Once the expression become true, it will trigger reject(true).
+
+*rejectWhen: signal*
+
+Listen the signal, once it is triggered, it will call reject().
+
 
 Q.promise()
 ===========

tests/unittests/tst_promise_rejectwhen_signal.qml

@@ -0,0 +1,31 @@
+import QtQuick 2.0
+import QtTest 1.0
+import QuickPromise 1.0
+
+TestCase {
+    name : "Promise_RejectWhen_Signal"
+
+    Timer {
+        id: timer;
+        repeat: true
+        interval : 50
+    }
+
+    Promise {
+        id : promise
+        rejectWhen: timer.onTriggered
+    }
+
+    function test_rejectwhen_signal() {
+        compare(promise.isRejected,false);
+        wait(10);
+        compare(promise.isRejected,false);
+        timer.start();
+        wait(10);
+        compare(promise.isRejected,false);
+        wait(50);
+        compare(promise.isRejected,true);
+
+    }
+}
+

tests/unittests/unittests.pro

@@ -16,4 +16,5 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\" BASEDIR=\\\"$$PWD/..\\\"
 DISTFILES += \
     tst_q.qml \
     tst_promise_resolve_signal.qml \
-    tst_promise_resolvewhen_signal.qml
+    tst_promise_resolvewhen_signal.qml \
+    tst_promise_rejectwhen_signal.qml