[Sandbox-commits] r1009 - oipf/js/test

1 Apr 2015

Author: ygrego
Date: 2015-04-01 09:18:21 +0000 (Wed, 01 Apr 2015)
New Revision: 1009

Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1009

Log:
Timer for unavailable test result has been modified, in method "updateTestResult". A new variable added, "result", in all necessary parts of this method.

Modified:
   oipf/js/test/Test.js

Modified: oipf/js/test/Test.js
===================================================================

--- oipf/js/test/Test.js	2015-04-01 09:08:47 UTC (rev 1008)
+++ oipf/js/test/Test.js	2015-04-01 09:18:21 UTC (rev 1009)
@@ -403,12 +403,16 @@
         console.group(currentTest["label"]);
         var timeStart = new Date();
         var self = this;
-       
+        var result = false;
         return new Promise(function(resolve, reject) {
             try {
                 timeout(5000)
                 .then(reject.bind(this, "No result returned."))
-                .then(object.afterTest.bind(object));
+                .then(function() {
+                    !result
+                    && object.afterTest 
+                    && object.afterTest.bind(object);
+                });
                 object.beforeTest && object.beforeTest(resolve, reject);
                 object[currentTest["method"]] && object[currentTest["method"]](resolve, reject);
             } catch (error) {
@@ -416,12 +420,14 @@
             }
         })
         .then(function(val) {
+            result = true;
             console.groupEnd(currentTest["label"]);
             var timeEnd = new Date();
             self.updateTestResultSuccess(timeStart, timeEnd, currentTest, val);
             object.afterTest && object.afterTest();
         })
         .catch(function(val) {
+            result = true;
             console.log(val);
             console.groupEnd(currentTest["label"]);
             var timeEnd = new Date();

    

[Sandbox-commits] r1009 - oipf/js/test

ygrego＠users.nuiton.org