calabash-android 0.4.19.pre2 → 0.4.19.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00ae1ecac8ab3e1399cda4706404382dff6a455b
-  data.tar.gz: b4670156a2737a79759ba4e855e0a6c30bd29ff1
+  metadata.gz: defa8cb4b262a40357f1f00a8c76c7155629952f
+  data.tar.gz: 353e205839ac2e5055d5792400437ba6e6c5c945
 SHA512:
-  metadata.gz: cff1e932b04d5f78010e1ff07b6fa2ca7a3de1f0864f4b538d4bdfbebfa97c5f70fd817da1a122f9ce5ad60425a95f20d9f56b9e21526e6a6585d905f050a7fb
-  data.tar.gz: 850e99a1f0a184e7c5f848237ed7110cf55151e624cb540a941d903ee1ad4f3920c0e53839020c5dd32a01fe88e901d781d5f8731d1567fc880bac46fce19380
+  metadata.gz: 314abb26cf7d23bdd0020b971c6eb7b474397639fab09f67a699860816a36af9e5dc2066b62c3dd2bcb4824690d5cd558d306d118d655479598fb269439cca45
+  data.tar.gz: 8f554170e76f87e4e33a6d160969e8b84dd03c1febd3c91b969fab036d63bb19c1ec6eed1a696693e19454ae02cf053e40ab4e96c318e87e677d5f50e5258991

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    calabash-android (0.4.16)
+    calabash-android (0.4.19.pre3)
       awesome_print
       cucumber
       escape (~> 0.0.4)
@@ -17,7 +17,7 @@ GEM
   specs:
     awesome_print (1.2.0)
     builder (3.2.2)
-    cucumber (1.3.9)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
@@ -31,7 +31,7 @@ GEM
     json (1.8.1)
     mime-types (2.0)
     multi_json (1.8.2)
-    multi_test (0.0.2)
+    multi_test (0.0.3)
     rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/Rakefile

@@ -15,7 +15,7 @@ def build
       "package",
       "-debug",
       "-Dtools.dir=\"#{Env.tools_dir}\"",
-      "-Dandroid.api.level=17",
+      "-Dandroid.api.level=19",
       "-Dversion=#{Calabash::Android::VERSION}",
     ]
     Dir.chdir(@test_server_dir) do

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.19.pre2"
+    VERSION = "0.4.19.pre3"
   end
 end

data/test-server/calabash-js/src/calabash.js

@@ -10,7 +10,7 @@
              (!!(t==='object' && object[property])) ||
              t==='unknown';
     }
-    //http://www.w3.org/TR/DOM-Level-2-Core/core.html
+    /*http://www.w3.org/TR/DOM-Level-2-Core/core.html*/
     var NODE_TYPES = {
         /*ELEMENT_NODE                   : */ 1 : 'ELEMENT_NODE',
         /*ATTRIBUTE_NODE                 : */ 2: 'ATTRIBUTE_NODE',
@@ -75,14 +75,14 @@
 
 
         }
-        else if (object instanceof Node)//TODO: support for frames!
+        else if (object instanceof Node)
         {
             res = computeRectForNode(object);
         }
-        else if (object instanceof NodeList || //TODO: support for frames!
+        else if (object instanceof NodeList ||
                  (typeof object=='object' && object &&
                   typeof object.length === 'number' &&
-                  object.length > 0 //array like
+                  object.length > 0
                   && typeof object[0] !== 'undefined'))
         {
             res = [];
@@ -97,9 +97,6 @@
         }
         return res;
     }
-    ///TODO: no support for now frames
-    //idea would be map XPath across window.frames
-    //must take care of visibility questions
 
     var exp = '%@'/* dynamic */,
         queryType = '%@',

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/CalabashChromeClient.java

@@ -1,5 +1,7 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
+import java.io.IOException;
+import java.lang.RuntimeException;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -13,10 +15,14 @@ import java.util.concurrent.TimeoutException;
 
 import android.os.Looper;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+import sh.calaba.org.codehaus.jackson.type.TypeReference;
+
 import android.os.Build;
 import android.os.ConditionVariable;
 import android.view.View;
 import android.webkit.JsPromptResult;
+import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 
@@ -144,7 +150,25 @@ public class CalabashChromeClient extends WebChromeClient {
 		return scriptFuture;
 	}
 
-	@SuppressWarnings("rawtypes")
+    public void evaluateCalabashScript(String script) {
+        webView.evaluateJavascript(script, new ValueCallback<String>() {
+            public void onReceiveValue(String rawResponseJSON) {
+                String jsonResponse = null;
+
+                try {
+                    jsonResponse = new ObjectMapper().readValue(
+                            rawResponseJSON, new TypeReference<String>() {
+                    });
+                } catch (IOException e) {
+                    throw new RuntimeException("Incorrect JSON format returned from javascript: " + rawResponseJSON, e);
+                }
+
+                scriptFuture.setResult(jsonResponse);
+            }
+        });
+    }
+
+    @SuppressWarnings("rawtypes")
 	public static class WebFuture implements Future {
 		private final ConditionVariable eventHandled;
 		private volatile boolean complete;

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/QueryHelper.java

@@ -12,6 +12,7 @@ import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.actions.webview.CalabashChromeClient.WebFuture;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 import android.util.Log;
+import android.webkit.ValueCallback;
 import android.webkit.WebView;
 
 public class QueryHelper {
@@ -89,17 +90,21 @@ public class QueryHelper {
     }
 	
 	public static WebFuture executeAsyncJavascriptInWebviews(WebView webView,
-			String scriptPath, String selector, String type) {
+		String scriptPath, String selector, String type) {
 
 		String script = readJavascriptFromAsset(scriptPath);
 
 		script = script.replaceFirst("%@", selector);
 		script = script.replaceFirst("%@", type);
-		
-		CalabashChromeClient chromeClient = CalabashChromeClient.prepareWebView(webView);		
-        webView.loadUrl("javascript:calabash_result = " + script + ";prompt('calabash:' + calabash_result);");
-		return chromeClient.getResult();
-	}
 
+        CalabashChromeClient chromeClient = CalabashChromeClient.prepareWebView(webView);
+
+        if (android.os.Build.VERSION.SDK_INT < 19) { // Android 4.4
+            webView.loadUrl("javascript:calabash_result = " + script + ";prompt('calabash:' + calabash_result);");
+        } else {
+            chromeClient.evaluateCalabashScript(script);
+        }
 
+        return chromeClient.getResult();
+	}
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.19.pre2
+  version: 0.4.19.pre3
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber