calabash-android 0.2.10 → 0.2.11

data/CHANGES.txt

@@ -1,3 +1,8 @@
+0.2.11:
+      Added is_enabled action that determines if a view is enabled.
+
+      Cleaner return values when executing javascript.
+
 0.2.10:
       Various small improvements and bug fixes.
 

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.2.10"
-    FRAMEWORK_VERSION = "0.2.10"
+    VERSION = "0.2.11"
+    FRAMEWORK_VERSION = "0.2.11"
   end
 end

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

@@ -64,6 +64,14 @@ public class Result {
     public static Result successResult() {
     	return successResult;
     }
+
+    public static Result failedResult() {
+        return new Result(false);
+    }
+
+    public static Result failedResult(final String message) {
+        return new Result(false, message);
+    }
     
     public String toString() {
         return "Success: " + success + ", message: " + message;

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

@@ -77,7 +77,7 @@ public class HttpServer extends NanoHTTPD {
                 lock.unlock();
             }
 
-        } else if ("/ready".equals(uri)) {
+        } else if (uri.endsWith("/ready")) {
             return new Response(HTTP_OK, MIME_HTML, Boolean.toString(ready));
 
 

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

@@ -0,0 +1,30 @@
+package sh.calaba.instrumentationbackend.actions.view;
+
+import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.TestHelpers;
+import sh.calaba.instrumentationbackend.actions.Action;
+import android.view.View;
+
+public class IsEnabled implements Action {
+
+    @Override
+    public Result execute(String... args) {
+        final String firstArgument = args[0];
+        final View foundView = TestHelpers.getViewById(firstArgument);
+        
+        if( null == foundView ) {
+            return notFoundResult(firstArgument);
+        }
+        
+        return new Result(foundView.isEnabled());
+    }
+
+    @Override
+    public String key() {
+        return "is_enabled";
+    }
+
+    private Result notFoundResult(final String firstArgument) {
+        return Result.failedResult(String.format("View with id %s was not found", firstArgument));
+    }
+}

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

@@ -13,9 +13,16 @@ public class ExecuteJavascript implements Action {
 		CalabashChromeClient ccc = CalabashChromeClient.findAndPrepareWebViews().get(0);
 		final WebView webView = ccc.getWebView();
 		final String script = "javascript:(function() {"
-				+ "var result;"
+				+ " var r;"
+				+ " try {"
+				+ "  r = (function() {"
 				+ args[0] + ";"
-				+ "prompt('calabash:'+result);" + "})()";
+				+ "  }());"
+				+ " } catch (e) {"
+				+ "  r = 'Exception: ' + e;"
+				+ " }"
+				+ " prompt('calabash:'+r);" 
+				+ "}())";
 
 		System.out.println("execute javascript: " + script);
 		
@@ -30,7 +37,12 @@ public class ExecuteJavascript implements Action {
 		String r = ccc.getResult();
 		System.out.println("javascript result: " + r);
 
-		return new Result(true, r);
+		boolean success = true;
+		if (r.startsWith("Exception:")) {
+			success = false;
+		}
+
+		return new Result(success, r);
 	}
 
 	@Override

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: calabash-android
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Jonas Maturana Larsen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-13 00:00:00 +02:00
+date: 2012-08-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,6 +197,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetTimeByContentDescription.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/time/SetTimeByIndex.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/ClickOnViewById.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/IsEnabled.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/LongPressOnViewById.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/Press.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/view/WaitForView.java