Android: force matchers to ignore layouts with GONE visibility, closes …

…#761 (#775)
wix · Jun 6, 2018 · a4b7e76 · a4b7e76
1 parent 3fe8353
commit a4b7e76
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/detox/.eslintrc b/detox/.eslintrc
@@ -3,7 +3,10 @@
   "extends": ["plugin:node/recommended"],
   "parserOptions": {
     "ecmaVersion": 2018,
-    "sourceType": "module"
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true
+    }
   },
   "rules": {
     "no-mixed-spaces-and-tabs": "error",

diff --git a/detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxMatcher.java b/detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxMatcher.java
@@ -33,15 +33,15 @@ private DetoxMatcher() {
 
     public static Matcher<View> matcherForText(String text) {
         // return anyOf(withText(text), withContentDescription(text));
-        return withText(text);
+        return allOf(withText(text), isDisplayed());
     }
 
     public static Matcher<View> matcherForContentDescription(String contentDescription) {
-        return withContentDescription(contentDescription);
+        return allOf(withContentDescription(contentDescription), isDisplayed());
     }
 
     public static Matcher<View> matcherForTestId(String testId) {
-        return withTagValue(is((Object) testId));
+        return allOf(withTagValue(is((Object) testId)), isDisplayed());
     }
 
     public static Matcher<View> matcherForAnd(Matcher<View> m1, Matcher<View> m2) {
@@ -67,7 +67,7 @@ public static Matcher<View> matcherWithDescendant(Matcher<View> m, Matcher<View>
     public static Matcher<View> matcherForClass(final String className) {
         try {
             Class cls = Class.forName(className);
-            return isAssignableFrom(cls);
+            return allOf(isAssignableFrom(cls), isDisplayed());
         } catch (ClassNotFoundException e) {
             // empty
         }