calabash-android 0.3.0.pre2 → 0.3.0.pre3

data/bin/calabash-android

@@ -45,11 +45,10 @@ elsif cmd == 'build'
 elsif cmd == 'run'
   raise_if_android_home_not_set
   if ARGV.empty? or not is_apk_file?(ARGV.first)
-    calabash_run()
+    exit calabash_run()
   else
-    calabash_run(relative_to_full_path(ARGV.shift))
+    exit calabash_run(relative_to_full_path(ARGV.shift))
   end
-  exit 0
 elsif cmd == 'gen'
   calabash_scaffold
   exit 0

data/bin/calabash-android-run.rb

@@ -9,7 +9,7 @@ def calabash_run(app_path = nil)
     puts "Please do the following to update your project:"
     puts "1) Open #{f} in a text editor"
     puts "2) Replace #{old_runner} with #{new_rummer}"
-    exit
+    exit 1
   end
 
   if app_path
@@ -26,7 +26,6 @@ def calabash_run(app_path = nil)
     end
     env = "PACKAGE_NAME=#{package_name(app_path)} "\
           "MAIN_ACTIVITY=#{main_activity(app_path)} "\
-          "TEST_PACKAGE_NAME=#{package_name(test_server_path)} "\
           "APP_PATH=\"#{app_path}\" "\
           "TEST_APP_PATH=\"#{test_server_path}\" "\
           "TEST_SERVER_PORT=#{test_server_port}"
@@ -36,11 +35,10 @@ def calabash_run(app_path = nil)
 
   STDOUT.sync = true
   arguments = ARGV - ["--google-maps-support"]
-  cmd = "cucumber #{arguments.join(" ")} #{env} #{"-c" unless is_windows?}"
+  cmd = "cucumber #{arguments.join(" ")} #{env}"
   puts cmd
-  IO.popen(cmd) do |io|
-    io.each { |s| print s }
-  end
+  exit_code = system(cmd)
 
   sleep(1)
+  exit_code
 end

data/calabash-android.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |s|
   s.add_dependency( "cucumber" )
   s.add_dependency( "json" )
   s.add_dependency( "retriable" )
+  s.add_dependency( "slowhandcuke" )
 
 end

data/lib/calabash-android/operations.rb

@@ -46,7 +46,7 @@ module Operations
   end
 
   def uninstall_apps
-    default_device.uninstall_app(ENV["TEST_PACKAGE_NAME"])
+    default_device.uninstall_app("sh.calaba.android.test")
     default_device.uninstall_app(ENV["PACKAGE_NAME"])
   end
 

data/lib/calabash-android/version.rb

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

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

@@ -17,23 +17,22 @@ import android.webkit.WebView;
 public class CalabashChromeClient extends WebChromeClient {
 	private final ConditionVariable eventHandled = new ConditionVariable();
 	private final Result result = new Result();
-	
-	
-	
 	private WebChromeClient mWebChromeClient;
 	private final WebView webView;
 
 	public CalabashChromeClient(WebView webView) {
 		this.webView = webView;
-		try {
-	        Method methodGetConfiguration = webView.getClass().getMethod("getWebChromeClient");
-	        mWebChromeClient = (WebChromeClient)methodGetConfiguration.invoke(webView);
-	        webView.setWebChromeClient(this);
-		} catch(Exception e) {
-			throw new RuntimeException(e);
+        if (Build.VERSION.SDK_INT < 16) { // jelly bean
+            try {
+                Method methodGetConfiguration = webView.getClass().getMethod("getWebChromeClient");
+                mWebChromeClient = (WebChromeClient)methodGetConfiguration.invoke(webView);
+            } catch(Exception e) {
+                throw new RuntimeException(e);
+            }
 		}
+        webView.setWebChromeClient(this);
 	}
-	
+
 	@Override
 	public boolean onJsPrompt(WebView view, String url, String message,	String defaultValue, JsPromptResult r) {
 		if (message != null && message.startsWith("calabash:")) {
@@ -41,7 +40,7 @@ public class CalabashChromeClient extends WebChromeClient {
 			System.out.println("onJsPrompt: " + message);
 			result.message = message.replaceFirst("calabash:", "");
 			eventHandled.open();
-			
+
 			return true;
 		} else {
 			if (mWebChromeClient == null) {
@@ -52,21 +51,22 @@ public class CalabashChromeClient extends WebChromeClient {
 			}
 		}
 	}
-	
-	
-	
+
 	public float getScale() {
+        if (Build.VERSION.SDK_INT >= 16) { // jelly bean
+            return webView.getScale();
+        }
 		try {
 			Field mActualScaleField = null;
 			Object targetObject = webView;
-			
+
 			if (Build.VERSION.SDK_INT < 14) { //before Ice cream sandwich
 				mActualScaleField = WebView.class.getDeclaredField("mActualScale");
 			} else {
 				Field zoomManagerField = WebView.class.getDeclaredField("mZoomManager");
 				zoomManagerField.setAccessible(true);
 				targetObject = zoomManagerField.get(webView);
-				
+
 				mActualScaleField = Class.forName("android.webkit.ZoomManager").getDeclaredField("mActualScale");
 			}
 			mActualScaleField.setAccessible(true);
@@ -75,11 +75,11 @@ public class CalabashChromeClient extends WebChromeClient {
 			throw new RuntimeException(e);
 		}
 	}
-	
+
 	public WebView getWebView() {
 		return webView;
 	}
-	
+
 	public String getResult() {
 		eventHandled.block(30000);
 		if (result.message == null) {
@@ -87,11 +87,11 @@ public class CalabashChromeClient extends WebChromeClient {
 		}
 		return result.message;
 	}
-	
+
 	private class Result {
 		String message;
 	}
-	
+
 	public static List<CalabashChromeClient> findAndPrepareWebViews() {
 		List<CalabashChromeClient> webViews = new ArrayList<CalabashChromeClient>();
 		ArrayList<View> views = InstrumentationBackend.solo.getCurrentViews();

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

@@ -0,0 +1,61 @@
+package sh.calaba.instrumentationbackend.actions.webview;
+
+import java.util.List;
+
+import sh.calaba.instrumentationbackend.InstrumentationBackend;
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.webkit.WebView;
+
+public class ExecuteAsyncJavascript implements Action {
+
+	@Override
+	public Result execute(String... args) {
+
+		List<CalabashChromeClient> list = CalabashChromeClient.findAndPrepareWebViews();
+		if (list.isEmpty()) {
+			return new Result(false, "No WebView component found");
+		}
+		
+		CalabashChromeClient ccc = list.get(0);
+		final WebView webView = ccc.getWebView();
+		final String script = "javascript:(function() {"
+				+ " function cb(ret) {"
+				+ "  prompt('calabash:'+ret);"
+				+ " }"
+				+ " try {"
+				+ "  (function(returnValue) {"
+				+ args[0] + ";"
+				+ "  }(cb));"
+				+ " } catch (e) {"
+				+ "  prompt('calabash:Exception: ' + e);"
+				+ " }"
+				+ "}())";
+
+		System.out.println("execute javascript: " + script);
+		
+		InstrumentationBackend.solo.getCurrentActivity().runOnUiThread(
+				new Runnable() {
+					@Override
+					public void run() {
+						webView.loadUrl(script);
+					}
+				});
+
+		String r = ccc.getResult();
+		System.out.println("javascript result: " + r);
+
+		boolean success = true;
+		if (r.startsWith("Exception:")) {
+			success = false;
+		}
+
+		return new Result(success, r);
+	}
+
+	@Override
+	public String key() {
+		return "execute_async_javascript";
+	}
+
+}

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

@@ -1,5 +1,7 @@
 package sh.calaba.instrumentationbackend.actions.webview;
 
+import java.util.List;
+
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
 import sh.calaba.instrumentationbackend.actions.Action;
@@ -10,7 +12,12 @@ public class ExecuteJavascript implements Action {
 	@Override
 	public Result execute(String... args) {
 
-		CalabashChromeClient ccc = CalabashChromeClient.findAndPrepareWebViews().get(0);
+		List<CalabashChromeClient> list = CalabashChromeClient.findAndPrepareWebViews();
+		if (list.isEmpty()) {
+			return new Result(false, "No WebView component found");
+		}
+		
+		CalabashChromeClient ccc = list.get(0);
 		final WebView webView = ccc.getWebView();
 		final String script = "javascript:(function() {"
 				+ " var r;"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre2
+  version: 0.3.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slowhandcuke
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'calabash-android drives tests for native  and hybrid Android apps. '
 email:
 - jonas@lesspainful.com
@@ -234,6 +250,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/DumpBodyHtml.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/DumpHtml.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/EnterTextByCssSelector.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/ExecuteAsyncJavascript.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/ExecuteJavascript.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/GetLoadProgress.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/GetUrl.java