detox 12.11.2 → 12.11.3

package/Detox-android/com/wix/detox/12.11.3/detox-12.11.3-javadoc.jar.md5

@@ -0,0 +1 @@
+e637ce306f39bdbbe8210666fff25b76

package/Detox-android/com/wix/detox/12.11.3/detox-12.11.3-javadoc.jar.sha1

@@ -0,0 +1 @@
+9c5b5e52c4511a8ddbfd77df7d539b9e28af9cc8

package/Detox-android/com/wix/detox/12.11.3/detox-12.11.3-sources.jar.md5

@@ -0,0 +1 @@
+e5656dd9d2d320318fc203353dc0c3b3

package/Detox-android/com/wix/detox/12.11.3/detox-12.11.3-sources.jar.sha1

@@ -0,0 +1 @@
+fd69a2a3594590cf52ff0241b95c9a5d082ea580

package/Detox-android/com/wix/detox/12.11.3/detox-12.11.3.aar.md5

@@ -0,0 +1 @@
+c47892438651668c6ac8c936fd2afead

package/Detox-android/com/wix/detox/12.11.3/detox-12.11.3.aar.sha1

@@ -0,0 +1 @@
+de51cf945e93c7a27482aec046f7f2d516a2d0d4

package/Detox-android/com/wix/detox/{12.11.2/detox-12.11.2.pom → 12.11.3/detox-12.11.3.pom}

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
-  <version>12.11.2</version>
+  <version>12.11.3</version>
   <packaging>aar</packaging>
   <name>Detox</name>
   <description>Gray box end-to-end testing and automation library for mobile apps</description>

package/Detox-android/com/wix/detox/12.11.3/detox-12.11.3.pom.md5

@@ -0,0 +1 @@
+f5dcd19ce4124ad9b8d676d499f1491d

package/Detox-android/com/wix/detox/12.11.3/detox-12.11.3.pom.sha1

@@ -0,0 +1 @@
+29b7ee14afac9b7a7a3181ea32d72b3107e1c744

package/Detox-android/com/wix/detox/maven-metadata.xml

@@ -3,10 +3,10 @@
   <groupId>com.wix</groupId>
   <artifactId>detox</artifactId>
   <versioning>
-    <release>12.11.2</release>
+    <release>12.11.3</release>
     <versions>
-      <version>12.11.2</version>
+      <version>12.11.3</version>
     </versions>
-    <lastUpdated>20190621111057</lastUpdated>
+    <lastUpdated>20190625112308</lastUpdated>
   </versioning>
 </metadata>

package/Detox-android/com/wix/detox/maven-metadata.xml.md5

@@ -1 +1 @@
-c5741b7a3b2e3ec1fbaead537d8ec670
+b8cac3012aba3f51f777d4f754bec7c6

package/Detox-android/com/wix/detox/maven-metadata.xml.sha1

@@ -1 +1 @@
-0a155d1f0b18ab73b4ba541e762aac4eef00a989
+bff95bd2751fb2ba959c488527b867e5fddbbe5f

package/android/detox/src/main/java/com/wix/detox/espresso/DetoxAssertion.java

@@ -2,20 +2,20 @@ package com.wix.detox.espresso;
 
 import android.view.View;
 
+import com.wix.detox.espresso.DetoxErrors.DetoxRuntimeException;
 import com.wix.detox.espresso.DetoxErrors.StaleActionException;
 
 import junit.framework.AssertionFailedError;
 
 import org.hamcrest.Matcher;
 
-import androidx.test.espresso.EspressoException;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewInteraction;
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static com.wix.detox.espresso.assertion.ViewAssertions.matches;
 import static org.hamcrest.Matchers.not;
 
 /**
@@ -48,25 +48,21 @@ public class DetoxAssertion {
     }
 
     public static void waitForAssertMatcher(final ViewInteraction i, final Matcher<View> m, double timeoutSeconds) {
-        long originTime = System.nanoTime();
-        long currentTime;
+        final long originTime = System.nanoTime();
 
         while (true) {
-            currentTime = System.nanoTime();
+            long currentTime = System.nanoTime();
             long elapsed = currentTime - originTime;
-            double seconds = (double)elapsed / 1000000000.0;
+            double seconds = (double) elapsed / 1000000000.0;
             if (seconds >= timeoutSeconds) {
-                return;
+                throw new DetoxRuntimeException("" + timeoutSeconds + "sec timeout expired without matching of given matcher: " + m);
             }
+
             try {
                 i.check(matches(m));
                 break;
-            } catch (Exception e) {
-                if (e instanceof EspressoException) {
-                    UiAutomatorHelper.espressoSync();
-                } else {
-                    throw e;
-                }
+            } catch (AssertionFailedError err) {
+                UiAutomatorHelper.espressoSync(20);
             }
         }
     }
@@ -81,16 +77,12 @@ public class DetoxAssertion {
             try {
                 assertMatcher(i, vm);
                 break;
-            } catch (Exception e) {
-                if (e instanceof EspressoException) {
-                    try {
-                        onView(searchMatcher).perform(searchAction);
-                    } catch (StaleActionException exStaleAction) {
-                        assertMatcher(i, vm);
-                        break;
-                    }
-                } else {
-                    throw e;
+            } catch (AssertionFailedError err) {
+                try {
+                    onView(searchMatcher).perform(searchAction);
+                } catch (StaleActionException exStaleAction) {
+                    assertMatcher(i, vm);
+                    break;
                 }
             }
         }

package/android/detox/src/main/java/com/wix/detox/espresso/DetoxMatcher.java

@@ -2,11 +2,8 @@ package com.wix.detox.espresso;
 
 import android.view.View;
 
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 
-import androidx.test.espresso.matcher.ViewMatchers;
 import androidx.test.espresso.matcher.ViewMatchers.Visibility;
 
 import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
@@ -15,8 +12,11 @@ import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
 import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static androidx.test.espresso.matcher.ViewMatchers.withTagValue;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static com.wix.detox.espresso.matcher.ViewMatchersKt.isMatchingAtIndex;
+import static com.wix.detox.espresso.matcher.ViewMatchersKt.isOfClassName;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.is;
@@ -36,15 +36,15 @@ public class DetoxMatcher {
 
     public static Matcher<View> matcherForText(String text) {
         // return anyOf(withText(text), withContentDescription(text));
-        return allOf(withText(text), ViewMatchers.withEffectiveVisibility(Visibility.VISIBLE));
+        return allOf(withText(text), withEffectiveVisibility(Visibility.VISIBLE));
     }
 
     public static Matcher<View> matcherForContentDescription(String contentDescription) {
-        return allOf(withContentDescription(contentDescription), ViewMatchers.withEffectiveVisibility(Visibility.VISIBLE));
+        return allOf(withContentDescription(contentDescription), withEffectiveVisibility(Visibility.VISIBLE));
     }
 
     public static Matcher<View> matcherForTestId(String testId) {
-        return allOf(withTagValue(is((Object) testId)), ViewMatchers.withEffectiveVisibility(Visibility.VISIBLE));
+        return allOf(withTagValue(is((Object) testId)), withEffectiveVisibility(Visibility.VISIBLE));
     }
 
     public static Matcher<View> matcherForAnd(Matcher<View> m1, Matcher<View> m2) {
@@ -67,34 +67,16 @@ public class DetoxMatcher {
         return allOf(m, hasDescendant(descendantMatcher));
     }
 
-    public static Matcher<View> matcherForClass(final String className) {
-        try {
-            Class cls = Class.forName(className);
-            return allOf(isAssignableFrom(cls), ViewMatchers.withEffectiveVisibility(Visibility.VISIBLE));
-        } catch (ClassNotFoundException e) {
-            // empty
-        }
-        return new BaseMatcher<View>() {
-            @Override
-            public boolean matches(Object item) {
-                return false;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("Class " + className + " not found on classpath. Are you using full class name?");
-            }
-        };
+    public static Matcher<View> matcherForClass(String className) {
+        return isOfClassName(className);
     }
 
     public static Matcher<View> matcherForSufficientlyVisible() {
         return isDisplayingAtLeast(75);
     }
 
-    // Special ViewAssertion is needed for GONE views
-    @Deprecated
     public static Matcher<View> matcherForNotVisible() {
-        return not(isDisplayed());
+        return anyOf(nullValue(), not(isDisplayed()));
     }
 
     public static Matcher<View> matcherForNotNull() {
@@ -106,27 +88,7 @@ public class DetoxMatcher {
     }
 
     public static Matcher<View> matcherForAtIndex(final int index, final Matcher<View> innerMatcher) {
-        return new BaseMatcher<View>() {
-            boolean foundMatch = false;
-            int count = 0;
-
-            @Override
-            public boolean matches(Object item) {
-                if (!innerMatcher.matches(item) || foundMatch) return false;
-
-                if (count == index) {                    
-                    foundMatch = true;
-                    return true;
-                }
-                ++count;
-                return false;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("matches " + index + "th view.");
-            }
-        };
+        return isMatchingAtIndex(index, innerMatcher);
     }
 
     public static Matcher<View> matcherForAnything() {

package/android/detox/src/main/java/com/wix/detox/espresso/assertion/ViewAssertions.java

@@ -0,0 +1,61 @@
+package com.wix.detox.espresso.assertion;
+
+import android.support.annotation.NonNull;
+import android.view.View;
+
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+
+import androidx.test.espresso.NoMatchingViewException;
+import androidx.test.espresso.ViewAssertion;
+
+import static androidx.test.espresso.core.internal.deps.guava.base.Preconditions.checkNotNull;
+import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
+
+/**
+ * A custom extension of {@link androidx.test.espresso.assertion.ViewAssertions}.
+ *
+ * <p/>Perhaps in the future we could extend Espresso's using Kotlin's extension functions.
+ */
+public class ViewAssertions {
+
+    /**
+     * An alternative to Espresso's {@link androidx.test.espresso.assertion.ViewAssertions#matches(Matcher)},
+     * which is more suitable for Detox' separated interaction-matcher architecture.
+     * See {@link MatchesViewAssertion} for more details.
+     */
+    public static ViewAssertion matches(final Matcher<? super View> viewMatcher) {
+        return new MatchesViewAssertion(checkNotNull(viewMatcher));
+    }
+
+    /**
+     * Identical to Espresso's {@link androidx.test.espresso.assertion.ViewAssertions}#MatchesViewAssertion
+     * typically created by {@link androidx.test.espresso.assertion.ViewAssertions#matches(Matcher)}, except
+     * that instead of throwing the {@link NoMatchingViewException} (given to the matcher by the <b>interaction</b>
+     * when the view wasn't in the hierarchy), it invokes the matcher nonetheless (i.e. with a <i>null</i> as the item).
+     */
+    private static class MatchesViewAssertion implements ViewAssertion {
+        final Matcher<? super View> viewMatcher;
+
+        private MatchesViewAssertion(final Matcher<? super View> viewMatcher) {
+            this.viewMatcher = viewMatcher;
+        }
+
+        @Override
+        public void check(View view, NoMatchingViewException noViewException) {
+            StringDescription description = new StringDescription();
+            description.appendText("'");
+            viewMatcher.describeTo(description);
+
+            description.appendText("' doesn't match the selected view.");
+
+            assertThat(description.toString(), noViewException != null ? null : view, viewMatcher);
+        }
+
+        @NonNull
+        @Override
+        public String toString() {
+            return String.format("MatchesViewAssertion(Detox){viewMatcher=%s}", viewMatcher);
+        }
+    }
+}

package/android/detox/src/main/java/com/wix/detox/espresso/matcher/NullableTypeSafeMatcher.java

@@ -0,0 +1,61 @@
+package com.wix.detox.espresso.matcher;
+
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.internal.ReflectiveTypeFinder;
+
+/**
+ * Identical to Espresso's {@link org.hamcrest.TypeSafeMatcher}, but allows nulls (in which case
+ * the "item" is passed-in into the sub-class nonetheless, as a null).
+ */
+public abstract class NullableTypeSafeMatcher<T> extends BaseMatcher<T> {
+    private static final ReflectiveTypeFinder TYPE_FINDER = new ReflectiveTypeFinder("matchesSafely", 1, 0);
+
+    final private Class<?> expectedType;
+
+    protected NullableTypeSafeMatcher() {
+        this(TYPE_FINDER);
+    }
+
+    protected NullableTypeSafeMatcher(Class<?> expectedType) {
+        this.expectedType = expectedType;
+    }
+
+    private NullableTypeSafeMatcher(ReflectiveTypeFinder typeFinder) {
+      this.expectedType = typeFinder.findExpectedType(getClass());
+    }
+
+    /**
+     * Subclasses should implement this. The item will already have been checked for
+     * the specific type and will never be null.
+     */
+    abstract boolean matchesSafely(T item);
+
+    /**
+     * Subclasses should override this. The item will already have been checked for
+     * the specific type and will never be null.
+     */
+    void describeMismatchSafely(T item, Description mismatchDescription) {
+        super.describeMismatch(item, mismatchDescription);
+    }
+
+    @Override
+    @SuppressWarnings({"unchecked"})
+    public final boolean matches(Object item) {
+        return (item == null || expectedType.isInstance(item)) && matchesSafely((T) item);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    final public void describeMismatch(Object item, Description description) {
+        if (!expectedType.isInstance(item)) {
+            description.appendText("was a ")
+                       .appendText(item.getClass().getName())
+                       .appendText(" (")
+                       .appendValue(item)
+                       .appendText(")");
+        } else {
+            describeMismatchSafely((T) item, description);
+        }
+    }
+}

package/android/detox/src/main/java/com/wix/detox/espresso/matcher/ViewAtIndexMatcher.kt

@@ -0,0 +1,26 @@
+package com.wix.detox.espresso.matcher
+
+import android.view.View
+import org.hamcrest.BaseMatcher
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+
+class ViewAtIndexMatcher(private val index: Int, private val innerMatcher: Matcher<View>) : BaseMatcher<View>() {
+    private var foundMatch = false
+    private var count = 0
+
+    override fun matches(item: Any): Boolean {
+        if (!innerMatcher.matches(item) || foundMatch) return false
+
+        if (count == index) {
+            foundMatch = true
+            return true
+        }
+        ++count
+        return false
+    }
+
+    override fun describeTo(description: Description) {
+        description.appendText("matches " + index + "th view.")
+    }
+}

package/android/detox/src/main/java/com/wix/detox/espresso/matcher/ViewMatchers.kt

@@ -0,0 +1,35 @@
+package com.wix.detox.espresso.matcher
+
+import android.view.View
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.*
+import org.hamcrest.BaseMatcher
+import org.hamcrest.Description
+
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers.*
+
+/*
+ * An extension of [androidx.test.espresso.matcher.ViewMatchers].
+ */
+
+fun isOfClassName(className: String): Matcher<View> {
+    try {
+        val cls = Class.forName(className)
+        return allOf(isAssignableFrom(cls as Class<out View>?), withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))
+    } catch (e: ClassNotFoundException) {
+        // empty
+    }
+
+    return object : BaseMatcher<View>() {
+        override fun matches(item: Any): Boolean {
+            return false
+        }
+
+        override fun describeTo(description: Description) {
+            description.appendText("Class $className not found on classpath. Are you using full class name?")
+        }
+    }
+}
+
+fun isMatchingAtIndex(index: Int, innerMatcher: Matcher<View>): Matcher<View> = ViewAtIndexMatcher(index, innerMatcher)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "detox",
   "description": "E2E tests and automation for mobile",
-  "version": "12.11.2",
+  "version": "12.11.3",
   "bin": {
     "detox": "local-cli/cli.js"
   },

package/scripts/postinstall.js

@@ -1,4 +1,4 @@
-if (process.platform === "darwin") {
+if (process.platform === "darwin" && !process.env.DETOX_DISABLE_POSTINSTALL) {
 	require("child_process").execFileSync(`${__dirname}/build_framework.ios.sh`, {
 		stdio: "inherit"
 	});

package/src/android/expect.js

@@ -146,24 +146,23 @@ class MatcherAssertionInteraction extends Interaction {
 }
 
 class WaitForInteraction extends Interaction {
-  constructor(invocationManager, element, matcher) {
+  constructor(invocationManager, element, assertionMatcher) {
     super(invocationManager);
     this._element = element;
-    this._originalMatcher = matcher;
-    // we need to override the original matcher for the element and add matcher to it as well
-    this._element._selectElementWithMatcher(this._element._originalMatcher.and(this._originalMatcher));
+    this._assertionMatcher = assertionMatcher;
+    this._element._selectElementWithMatcher(this._element._originalMatcher);
   }
 
   async withTimeout(timeout) {
     if (typeof timeout !== 'number') throw new Error(`WaitForInteraction withTimeout argument must be a number, got ${typeof timeout}`);
     if (timeout < 0) throw new Error('timeout must be larger than 0');
 
-    this._call = DetoxAssertionApi.waitForAssertMatcher(call(this._element._call), this._originalMatcher._call.value, timeout / 1000);
+    this._call = DetoxAssertionApi.waitForAssertMatcher(call(this._element._call), this._assertionMatcher._call.value, timeout / 1000);
     await this.execute();
   }
 
   whileElement(searchMatcher) {
-    return new WaitForActionInteraction(this._invocationManager, this._element, this._originalMatcher, searchMatcher);
+    return new WaitForActionInteraction(this._invocationManager, this._element, this._assertionMatcher, searchMatcher);
   }
 }
 

package/src/devices/android/ADB.js

@@ -66,6 +66,10 @@ class ADB {
       let device;
       if (this.isEmulator(deviceAdbName)) {
         const port = _.split(deviceAdbName, '-')[1];
+        if (!port) {
+          _reportTelnetPortResolutionError(input, devicesList, deviceAdbName, port);
+        }
+
         const telnet = new EmulatorTelnet();
         await telnet.connect(port);
         const name = await telnet.avdName();
@@ -103,7 +107,7 @@ class ADB {
 
   async install(deviceId, apkPath) {
     apkPath = `"${escape.inQuotedString(apkPath)}"`;
-    
+
     const apiLvl = await this.apiLevel(deviceId);
 
     let childProcess;
@@ -283,4 +287,20 @@ class ADB {
   }
 }
 
+function _reportTelnetPortResolutionError(input, devicesList, deviceAdbName, port) {
+  const {encodeBase64} = require('../../utils/encoding');
+  const errorMessage = [
+    `Failed to determine telnet port for emulator device '${deviceAdbName}'!`,
+    `Please help us out by reporting dump below in: https://github.com/wix/Detox/issues/1427`,
+    `------ BEGIN DUMP ------`,
+    `adb devices base64: ${encodeBase64(input)}`,
+    `adb devices: ${input}`,
+    `devicesList: ${devicesList}`,
+    `port: ${port}`,
+    `------  END DUMP  ------`,
+  ].join('\n');
+
+  throw new Error(errorMessage);
+}
+
 module.exports = ADB;

package/Detox-android/com/wix/detox/12.11.2/detox-12.11.2-javadoc.jar.md5

@@ -1 +0,0 @@
-2ffc142c41adab57c69b5734d7365c04

package/Detox-android/com/wix/detox/12.11.2/detox-12.11.2-javadoc.jar.sha1

@@ -1 +0,0 @@
-76015cb8e56dedd347bbaaf4d0086365514eaf71

package/Detox-android/com/wix/detox/12.11.2/detox-12.11.2-sources.jar.md5

@@ -1 +0,0 @@
-b221b88bb3ca15e4fffa4ff7ec7859f2

package/Detox-android/com/wix/detox/12.11.2/detox-12.11.2-sources.jar.sha1

@@ -1 +0,0 @@
-82510015f66a4183ed32e936580c2540faf3d8ab

package/Detox-android/com/wix/detox/12.11.2/detox-12.11.2.aar.md5

@@ -1 +0,0 @@
-33bd91bd0ebde41adf798e01136d1284

package/Detox-android/com/wix/detox/12.11.2/detox-12.11.2.aar.sha1

@@ -1 +0,0 @@
-d4450848b274ac5fe0bcecbeff8067fe2c9b5931

package/Detox-android/com/wix/detox/12.11.2/detox-12.11.2.pom.md5

@@ -1 +0,0 @@
-4b13101aba4d44277dcfcdee0d6e0a3f

package/Detox-android/com/wix/detox/12.11.2/detox-12.11.2.pom.sha1

@@ -1 +0,0 @@
-cf53b31d8541c0e04fcc2207722c53c76c7f7b98