fix(elementexplorer): eval always treat result as promise

angular · Nov 21, 2014 · 6a9b87c · 6a9b87c
1 parent 2f245ee
commit 6a9b87c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/bin/elementexplorer.js b/bin/elementexplorer.js
@@ -80,7 +80,12 @@ var flowEval = function(code, context, file, callback) {
       process.domain.emit('error', vmErr);
       process.domain.exit();
     }
-    return result.then(function(val) {return val});
+
+    if (webdriver.promise.isPromise(result)) {
+      return result.then(function(val) {return val});
+    } else {
+      return result; 
+    }
   }).then(function(res) {
     if (!vmErr) {
       callback(null, res);