calabash-android 0.4.7.pre2 → 0.4.7.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f123fa2bea595521ceb0b48e3e3cf1a14fd9af0d
-  data.tar.gz: fa364e921ab885cf9be776f70f77f72cd9405a7b
+  metadata.gz: 079fd75ffa1a41cf381a4f8cd72b1cadbee2e04d
+  data.tar.gz: a183f3c9dc459adef3d13f067c868e2c6016dda5
 SHA512:
-  metadata.gz: aca7e7508a03828614d624bb64fe38a42838a83d8c692db21a8e0c6ca13aefa7ef536dfc778fa547156f2536270ed17e608c467ff24b89a31649aee4d87406a6
-  data.tar.gz: d80a3ac4b35bb3958f5d27e6d6be44881a0549594ead5f543965426c1273e9b299218f3e5cc5b5407cf5ef267372641f773fd6c49361894d78993e91031db329
+  metadata.gz: 2f7d86ad6876dc8c317385069746046d591d55730aabe3a919ef95e1287405c2c0bf34f81b9a77e18fadc0a60bd16fc3c21486a304302a2b8c5497142a0ee5c1
+  data.tar.gz: f6e8a2bae10aa4af04f535d4cd7a140ca6c8f83fd55cf5dd4c6e12501f4fcfc1c454615c5c2ef5261008a410cf632519c20b4c3a77a4d3938a0362d2b5178f34

data/lib/calabash-android/operations.rb

@@ -63,6 +63,10 @@ module Operations
     default_device.install_app(app_path)
   end
 
+  def update_app(app_path)
+    default_device.update_app(app_path)
+  end
+
   def uninstall_apps
     default_device.uninstall_app(package_name(default_device.test_server_path))
     default_device.uninstall_app(package_name(default_device.app_path))
@@ -210,6 +214,19 @@ module Operations
       end
     end
 
+    def update_app(app_path)
+      cmd = "#{adb_command} install -r \"#{app_path}\""
+      log "Updating: #{app_path}"
+      result = `#{cmd}`
+      log "result: #{result}"
+      succeeded = result.include?("Success")
+
+      unless succeeded
+        ::Cucumber.wants_to_quit = true
+        raise "#{pn} did not get updated. Aborting!"
+      end    
+    end
+
     def uninstall_app(package_name)
       log "Uninstalling: #{package_name}"
       log `#{adb_command} uninstall #{package_name}`

data/lib/calabash-android/version.rb

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

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

@@ -360,9 +360,13 @@ public class NanoHTTPD
 				{
 					String contentType = "";
 					String contentTypeHeader = header.getProperty("content-type");
-					StringTokenizer st = new StringTokenizer( contentTypeHeader , "; " );
-					if ( st.hasMoreTokens()) {
-						contentType = st.nextToken();
+					
+					StringTokenizer st = null;
+					if (contentTypeHeader != null) {
+					    st = new StringTokenizer(contentTypeHeader, ",; ");
+					    if (st.hasMoreTokens()) {
+					        contentType = st.nextToken();
+					    }
 					}
 
 					if (contentType.equalsIgnoreCase("multipart/form-data"))

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

@@ -1,5 +1,6 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -36,6 +37,22 @@ public class CalabashChromeClient extends WebChromeClient {
 			} catch (Exception e) {
 				throw new RuntimeException(e);
 			}
+		}  else {
+			try {
+				
+				/*
+				 * pick up the chromeClient from the webView
+				 * this is required because in Jelly Bean there is no getWebChromeClient
+				 * above sdk 16.This will help HTML5 hybrid application (Cordova) to pass the prompt messages 
+				 * to Native code. Previously the CalabashChromeClient did not populate the mWebChromeClient
+				 * which lead to the Cordova.exec messages not forward to the Cordova ChromeClient.
+				 */
+				Field field = getChromeClientField(webView.getClass());
+				field.setAccessible(true);
+				mWebChromeClient = (WebChromeClient) field.get(webView);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
 		}
 
         if ( Looper.getMainLooper().getThread() == Thread.currentThread()) {
@@ -50,6 +67,21 @@ public class CalabashChromeClient extends WebChromeClient {
         }
 	}
 
+	/*
+	 * returns the chromeClient from the WebView.
+	 * recursively moves up to its superClass to get the chromeClient 
+	 * if there is no chromeClient it returns null.
+	 */
+	private Field getChromeClientField(Class currentClass) {
+		if (currentClass == null)
+			return null;
+		try {
+			return currentClass.getDeclaredField("chromeClient");
+		} catch (NoSuchFieldException e) {
+			return getChromeClientField(currentClass.getSuperclass());
+		}
+	}
+
 	@Override
 	public boolean onJsPrompt(WebView view, String url, String message,
 			String defaultValue, JsPromptResult r) {

metadata

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