calabash-android 0.3.3.pre2 → 0.3.3.pre3

data/bin/calabash-android-build.rb

@@ -13,11 +13,11 @@ def calabash_build(app)
       FileUtils.cp(unsigned_test_apk, "TestServer.apk")
       FileUtils.cp(File.join(File.dirname(__FILE__), '..', 'test-server/AndroidManifest.xml'), "AndroidManifest.xml")
 
-      unless system  %Q{ruby -pi.bak -e "gsub(/#targetPackage#/, '#{package_name(app)}')" AndroidManifest.xml}
+      unless system %Q{ruby -pi.bak -e "gsub(/#targetPackage#/, '#{package_name(app)}')" AndroidManifest.xml}
         raise "Could not replace package name in manifest"
       end
 
-      unless system("\"#{ENV["ANDROID_HOME"]}/platform-tools/aapt\" package -M AndroidManifest.xml  -I #{android_platform}/android.jar -F dummy.apk")
+      unless system %Q{"#{ENV["ANDROID_HOME"]}/platform-tools/aapt" package -M AndroidManifest.xml  -I "#{android_platform}/android.jar" -F dummy.apk}
         raise "Could not create dummy.apk"
       end
 

data/lib/calabash-android/operations.rb

@@ -266,7 +266,7 @@ module Operations
       if is_windows?
         %Q("#{ENV["ANDROID_HOME"]}\\platform-tools\\adb.exe" #{device_args})
       else
-        %Q(#{ENV["ANDROID_HOME"]}/platform-tools/adb #{device_args})
+        %Q("#{ENV["ANDROID_HOME"]}/platform-tools/adb" #{device_args})
       end
     end
 
@@ -395,7 +395,7 @@ module Operations
     ni
   end
 
-  def background(secs)
+  def app_to_background(secs)
     ni
   end
 

data/lib/calabash-android/version.rb

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

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

@@ -52,36 +52,12 @@ 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);
-			return mActualScaleField.getFloat(targetObject);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	public WebView getWebView() {
 		return webView;
 	}
 
 	public String getResult() {
-		eventHandled.block(30000);
+		eventHandled.block(3000);
 		if (result.message == null) {
 			throw new RuntimeException("Timed out waiting for result for JavaScript");
 		}

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

@@ -56,7 +56,7 @@ public class QueryHelper {
 			CalabashChromeClient calabashChromeClient = CalabashChromeClient.findAndPrepareWebViews().get(0);
 		
 			WebView webView = calabashChromeClient.getWebView();
-			float scale = calabashChromeClient.getScale();
+			float scale = calabashChromeClient.getWebView().getScale();
 			
 			System.out.println("scale: " + scale);
 			int[] webviewLocation = new int[2];

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

@@ -55,14 +55,12 @@ public class ScrollTo implements Action {
 		}
 
 	}
-    
-    
-    
+
     private boolean isVisible(Map<String, Object> rectangle, CalabashChromeClient calabashChromeClient) {
     	WebView webView = calabashChromeClient.getWebView();
     	int windowTop = webView.getScrollY();
     	int windowBottom = webView.getScrollY() + webView.getHeight();
-    	int centerY = (int) ((Integer)rectangle.get("center_y") * calabashChromeClient.getScale());
+    	int centerY = (int) ((Integer)rectangle.get("center_y") * calabashChromeClient.getWebView().getScale());
 
     	return windowTop < centerY && centerY < windowBottom;  	
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.3.pre2
+  version: 0.3.3.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber