calabash-android 0.4.8 → 0.4.9.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4cf383a1c32c3098f5141338fe5229d1756fd0
-  data.tar.gz: b2fac39ede49cc01d0e865d06ee7854f4dc5b12b
+  metadata.gz: b64a4d3ad951ea41eb7aaa04b1048277c0d5870b
+  data.tar.gz: 6a499be88df0feb60f24634fd54751561fd4e03b
 SHA512:
-  metadata.gz: 51cf5feab3c3bb82e2484662dcaa4517212d645b09b9f815270908b5bb1f9b2b1ace25b7c2eeb16d8d193f7ef9ae338e3a0784497c6340beb2f4dd00bfd44a7a
-  data.tar.gz: c54d2f6cdc3c16b19f3d2c74a7fa3eb2954e6fec9fdfd10dbea1a4d7333d25ef6313af54521ff863329c7e9310205f29d67c5b93051e4579b55ab0d4194d1768
+  metadata.gz: 470cbd5b68524a526cc62667f941da3fb56ef2416f9cd62262dad59e7c10593d2ed561ea8abf1b95099d402c870b186149ad4189d74cd409418bbc47657014fb
+  data.tar.gz: 0e0010e67bc27f489026f727c5d356b884e75a1616cf4377339f52267c758e8bac112dbd0250871dbcfae5e4d9741f97c2eb7ab339e9973a4a1a6276dff3503b

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.8"
+    VERSION = "0.4.9.pre1"
   end
 end

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

@@ -38,7 +38,6 @@ public class CalabashChromeClient extends WebChromeClient {
 				throw new RuntimeException(e);
 			}
 		}  else {
-			try {
 				
 				/*
 				 * pick up the chromeClient from the webView
@@ -48,11 +47,20 @@ public class CalabashChromeClient extends WebChromeClient {
 				 * which lead to the Cordova.exec messages not forward to the Cordova ChromeClient.
 				 */
 				Field field = getChromeClientField(webView.getClass());
+				if (field == null) {
+					throw new UnableToFindChromeClientException(webView);
+				}
 				field.setAccessible(true);
-				mWebChromeClient = (WebChromeClient) field.get(webView);
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
+				try {
+					mWebChromeClient = (WebChromeClient) field.get(webView);
+				} catch (IllegalArgumentException e) {					
+					e.printStackTrace();
+					throw new UnableToFindChromeClientException(e, webView);
+				} catch (IllegalAccessException e) {
+					
+					e.printStackTrace();
+					throw new UnableToFindChromeClientException(e, webView);
+				}			
 		}
 
         if ( Looper.getMainLooper().getThread() == Thread.currentThread()) {

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

@@ -0,0 +1,26 @@
+package sh.calaba.instrumentationbackend.actions.webview;
+
+import android.webkit.WebView;
+
+@SuppressWarnings("serial")
+public class UnableToFindChromeClientException extends RuntimeException {
+
+	private final WebView webView;
+
+	public UnableToFindChromeClientException(WebView webView) {		
+		this.webView = webView;
+	}
+
+	public UnableToFindChromeClientException(Exception e, WebView webView) {
+		super(e);
+		this.webView = webView;
+	}
+
+	public WebView getWebView() {
+		return webView;
+	}
+
+	public String toString() {
+		return super.toString() + "- WebView: " + webView;
+	}
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryASTWith.java

@@ -10,6 +10,8 @@ import java.util.concurrent.Future;
 import org.antlr.runtime.tree.CommonTree;
 
 import sh.calaba.instrumentationbackend.actions.webview.QueryHelper;
+import sh.calaba.instrumentationbackend.actions.webview.UnableToFindChromeClientException;
+import android.util.Log;
 import android.view.View;
 import android.webkit.WebView;
 
@@ -134,8 +136,14 @@ public class UIQueryASTWith implements UIQueryAST {
 		if (!(this.value instanceof String)) {
 			return null;
 		}
-		return QueryHelper.executeAsyncJavascriptInWebviews(o,
-				"calabash.js", (String) this.value,this.propertyName);
+		try {
+			return QueryHelper.executeAsyncJavascriptInWebviews(o,
+					"calabash.js", (String) this.value,this.propertyName);
+				
+		} catch (UnableToFindChromeClientException e) {
+			Log.w("Calabash","Unable to find UnableToFindChromeClientException");
+			return null;
+		}
 				
 	}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -406,6 +406,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/ScrollTo.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/SetPropertyByCssSelector.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/SetText.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/UnableToFindChromeClientException.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/json/JSONUtils.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/CompletedFuture.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/InvocationOperation.java
@@ -858,9 +859,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2