run_loop 1.1.1.pre2 → 1.1.1.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aed9a3d8201f63a37840030f1a5f1546f1b797b
-  data.tar.gz: 416eaa3768ed27b66d77ea3c3df9e6c9a2f3aa6e
+  metadata.gz: 1822fe07be976e6f4388798cf3056b7580d014f6
+  data.tar.gz: 267f9c4e9035cebe48ef7f1ff31c75b4f76a0943
 SHA512:
-  metadata.gz: c2be0670d8965174a841caeb073066da24251dcb3c4e58585508fa5f5c122f4b763cd5cf565df61ef5e1b58dcd560bb84aa7786eaae9895a907e00de3df85d76
-  data.tar.gz: 56110caaf37b4b8eb4e080ea307a40854a4bc73ddacbb721f2f590ed4f477c45c3c10242bffeee3e3d877933103390a0cec5d488bda6ed84034fb1aeb37843aa
+  metadata.gz: b3f667f1ea1ed63c1378806ab311d9489567d5567db883ea6467b3dbf0511d9ec2a49961f5cbcd6da042bd178b67aa2346335d0f0bce71c91deb9310f105cf7c
+  data.tar.gz: 8f7b98186a41edc20c158b577ac141a59259ea65b58c556f1dc654646d53d47b2574e98c138d8d9dc0aed6e742f1135d72c8cb3e506e16977870533adf8e4654

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = '1.1.1.pre2'
+  VERSION = '1.1.1.pre3'
 
   # A model of a software release version that can be used to compare two versions.
   #

data/scripts/run_loop_fast_uia.js

@@ -146,10 +146,12 @@ if (typeof JSON !== 'object') {
 }());
 
 
+_RUN_LOOP_MAX_RETRY_AFTER_HANDLER = 10;
 var _expectedIndex = 0,//expected index of next command
     _actualIndex=0,//actual index of next command by reading commandPath
     _exp,//expression to be eval'ed
-    _result;
+    _result,
+    _lastResponse=null;
 
 var Log = (function () {
     var forceFlush = [],
@@ -221,8 +223,11 @@ function isLocationPrompt(alert) {
 }
 
 UIATarget.onAlert = function (alert) {
-    Log.output({"output":"on alert"}, true);
-    var target = UIATarget.localTarget();
+    var target = UIATarget.localTarget(),
+        app = target.frontMostApp(),
+        req = null,
+        rsp = null,
+        actualIndex = null;
     target.pushTimeout(10);
     function attemptTouchOKOnLocation(retry_count) {
         retry_count = retry_count || 0;
@@ -248,6 +253,20 @@ UIATarget.onAlert = function (alert) {
 
     attemptTouchOKOnLocation(0);
     target.popTimeout();
+    for (var i=0;i<_RUN_LOOP_MAX_RETRY_AFTER_HANDLER;i++) {
+        req = app.preferencesValueForKey(__calabashRequest);
+        rsp = app.preferencesValueForKey(__calabashResponse);
+        actualIndex = req && req['index'];
+        if (req && !isNaN(actualIndex) && actualIndex <= _lastResponse['index']) {
+            UIALogger.logMessage("Deleting previous response: "+(rsp && rsp['index']));
+            app.setPreferencesValueForKey(0, __calabashRequest);
+            app.setPreferencesValueForKey(null, __calabashRequest);
+        }
+        if (_lastResponse) {
+            UIALogger.logMessage("Re-Writing response: "+_lastResponse['value']);
+            _response(_lastResponse);
+        }
+    }
     return true;
 };
 
@@ -292,9 +311,8 @@ var target = null,
             tmp;
 
         for (i=0; i<MAX_TRIES; i+=1) {
-            UIALogger.logMessage("Write result...");
             tmp = target.frontMostApp().preferencesValueForKey(__calabashResponse);
-            UIALogger.logMessage("Last response..."+tmp);
+            UIALogger.logMessage("Last response..."+(tmp && tmp['index']+"->"+tmp['value']));
             target.frontMostApp().setPreferencesValueForKey(sanitized, __calabashResponse);
             res = target.frontMostApp().preferencesValueForKey(__calabashRequest);
             res = target.frontMostApp().preferencesValueForKey(__calabashResponse);
@@ -302,7 +320,6 @@ var target = null,
             target.delay(0.1);
             res = target.frontMostApp().preferencesValueForKey(__calabashResponse);
             UIALogger.logMessage("Post delay response..."+(res && res['value']));
-
             if (res && res['index'] == sanitized['index']) {
                 UIALogger.logMessage("Storage succeeded: "+ res['index']);
                 return;
@@ -312,18 +329,18 @@ var target = null,
             }
         }
         throw new Error("Unable to write to preferences");
-
     },
     _success = function(result,index) {
-
-        _response({"status":'success', "value":result, "index": index});
+        _lastResponse = {"status":'success', "value":result, "index": index};
+        _response(_lastResponse);
 
     },
     _failure = function(err, index) {
-        _response({"status":'error',
-                   "value":err.toString(),
-                   "backtrace":(err.stack ? err.stack.toString() : ""),
-                   "index":index});
+        _lastResponse = {"status":'error',
+                         "value":err.toString(),
+                         "backtrace":(err.stack ? err.stack.toString() : ""),
+                         "index":index};
+        _response(_lastResponse);
     },
     _resetCalabashPreferences = function () {
         //Implementation is weird but reading pref values seems to have side effects

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_loop
 version: !ruby/object:Gem::Version
-  version: 1.1.1.pre2
+  version: 1.1.1.pre3
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor