calabash-android 0.4.0.pre18 → 0.4.0

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.0.pre18"
+    VERSION = "0.4.0"
   end
 end

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

@@ -159,14 +159,10 @@ public class Query {
 		}
 
 	}
-	
-	public List<View> allVisibleViews() {
-		return viewFetcher.getAllViews(false);
-	}
 
     public List<View> rootViews() {
         Set<View> parents = new HashSet<View>();
-        for (View v : allVisibleViews())
+        for (View v : viewFetcher.getAllViews(false))
         {
             View parent = viewFetcher.getTopParent(v);
             System.out.println(parent);

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryASTClassName.java

@@ -53,8 +53,10 @@ public class UIQueryASTClassName implements UIQueryAST {
 					}
 					
 					
-				}					
-				return result;
+				}
+
+                List filteredResult = visibility.evaluateWithViews(result, direction, visibility);
+				return filteredResult;
 			}
 		});
 		

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryASTPredicate.java

@@ -51,7 +51,7 @@ public class UIQueryASTPredicate implements UIQueryAST {
 
 				}
 
-				return filteredResult;
+				return visibility.evaluateWithViews(filteredResult, direction, visibility);
 			}
 		});
 	}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryUtils.java

@@ -149,6 +149,11 @@ public class UIQueryUtils {
 	public static boolean isVisible(Object v) {
 		if (!(v instanceof View)) { return true; }		
 		View view = (View) v;
+
+        if (view.getWidth() == 0 || view.getWidth() == 0) {
+            return false;
+        }
+
 		return view.isShown() && viewFetcher.isViewSufficientlyShown(view);
 	}
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre18
-  prerelease: 6
+  version: 0.4.0
+  prerelease: 
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -844,9 +844,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23