calabash-android 0.3.2.pre3 → 0.3.2.pre4

data/lib/calabash-android/operations.rb

@@ -244,12 +244,24 @@ module Operations
       end
 
       @@screenshot_count ||= 0
-      res = http("/screenshot")
-
       path = "#{prefix}#{name}_#{@@screenshot_count}.png"
-      File.open(path, 'wb') do |f|
-        f.write res
+
+      if ENV["SCREENSHOT_VIA_USB"] == "true"
+        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenShotTaker.jar')} #{path}"
+        log screenshot_cmd
+        raise "Could not take screenshot" unless system(screenshot_cmd)
+      else
+        begin
+          res = http("/screenshot")
+        rescue EOFError
+          raise "Could not take screenshot. App is most likely not running anymore."
+        end
+        File.open(path, 'wb') do |f|
+          f.write res
+        end
       end
+
+
       @@screenshot_count += 1
       path
     end
@@ -304,7 +316,11 @@ module Operations
     end
 
     def shutdown_test_server
-      http("/kill")
+      begin
+        http("/kill")
+      rescue EOFError
+        log ("Could not kill app. App is most likely not running anymore.")
+      end
     end
 
     ##location

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.2.pre3"
+    VERSION = "0.3.2.pre4"
   end
 end

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

@@ -14,7 +14,7 @@ public class EnterTextByCssSelector implements Action {
     public Result execute(String... args) {
     	final String cssSelector = args[0];
     	final String value = args[1];
-    	
+
     	for (CalabashChromeClient ccc : CalabashChromeClient.findAndPrepareWebViews()) {
     		final WebView webView = ccc.getWebView();
 			
@@ -72,10 +72,10 @@ public class EnterTextByCssSelector implements Action {
                                     "            fireHTMLEvent(elem, 'blur');\n" +
                                     "        }\n" +
                                     "";
-                    
+
                     webView.loadUrl("javascript:(function() {" +
                     		functions +
-                    		"var elem = document.getElementById('" + cssSelector + "'); selectInputField(elem); enterTextIntoInputField(elem, '" + value + "'); deselectInputField(elem); " +
+                    		"var elem = document.querySelector(\"" + cssSelector + "\"); selectInputField(elem); enterTextIntoInputField(elem, '" + value + "'); deselectInputField(elem); " +
                             "prompt('calabash:true');" +
                             "})()");
                 }

metadata

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