Skip to content

feat(android): add dialog root fallback for React Native Modal support #4933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuki2006 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(android): add dialog root fallback for React Native Modal support #4933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions detox/android/detox/src/full/java/com/wix/detox/espresso/DetoxAssertion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@

import org.hamcrest.Matcher;

import androidx.test.espresso.NoMatchingViewException;
import androidx.test.espresso.ViewAction;
import androidx.test.espresso.ViewInteraction;
import androidx.test.espresso.matcher.RootMatchers;

import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
Expand All @@ -32,9 +34,14 @@ private DetoxAssertion() {

/**
* Asserts the given matcher for the provided view interaction.
* Falls back to dialog root if the assertion fails in the default root.
*/
public static ViewInteraction assertMatcher(ViewInteraction viewInteraction, Matcher<View> viewMatcher) {
return viewInteraction.check(matches(viewMatcher));
try {
return viewInteraction.check(matches(viewMatcher));
} catch (NoMatchingViewException e) {
return viewInteraction.inRoot(RootMatchers.isDialog()).check(matches(viewMatcher));
}
}

/**
Expand All @@ -60,6 +67,7 @@ public static ViewInteraction assertNotExists(ViewInteraction viewInteraction) {

/**
* Waits until the provided matcher matches the view interaction or a timeout occurs.
* Tries both the default root and dialog root on each iteration.
*/
public static void waitForAssertMatcher(final ViewInteraction viewInteraction, final Matcher<View> viewMatcher, double timeoutSeconds) {
final long startTime = System.nanoTime();
Expand All @@ -77,7 +85,21 @@ public static void waitForAssertMatcher(final ViewInteraction viewInteraction, f
viewInteraction.check(matches(viewMatcher));
break;
} catch (AssertionFailedError err) {
UiAutomatorHelper.espressoSync(20);
// Try dialog root as fallback
try {
viewInteraction.inRoot(RootMatchers.isDialog()).check(matches(viewMatcher));
break;
} catch (Exception dialogErr) {
UiAutomatorHelper.espressoSync(20);
}
} catch (NoMatchingViewException e) {
// Try dialog root as fallback
try {
viewInteraction.inRoot(RootMatchers.isDialog()).check(matches(viewMatcher));
break;
} catch (Exception dialogErr) {
UiAutomatorHelper.espressoSync(20);
}
}
}
}
Expand Down
9 changes: 8 additions & 1 deletion ...roid/detox/src/full/java/com/wix/detox/espresso/performer/MultipleViewsActionPerformer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import com.wix.detox.espresso.errors.DetoxNoMatchingViewException

import android.view.View
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.NoMatchingViewException
import androidx.test.espresso.ViewAction
import androidx.test.espresso.matcher.RootMatchers
import org.hamcrest.Matcher

class MultipleViewsActionPerformer(
Expand All @@ -20,7 +22,12 @@ class MultipleViewsActionPerformer(
val indexedMatcher = DetoxMatcher.matcherForAtIndex(index, matcher)

try {
onView(indexedMatcher).perform(action)
try {
onView(indexedMatcher).perform(action)
} catch (e: NoMatchingViewException) {
// Fallback: try dialog root (e.g. React Native Modal)
onView(indexedMatcher).inRoot(RootMatchers.isDialog()).perform(action)
}

(action as? ViewActionWithResult<*>)?.getResult()?.let { results.add(it) }

Expand Down
8 changes: 7 additions & 1 deletion ...android/detox/src/full/java/com/wix/detox/espresso/performer/SingleViewActionPerformer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,19 @@ import android.view.View
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.NoMatchingViewException
import androidx.test.espresso.ViewAction
import androidx.test.espresso.matcher.RootMatchers
import org.hamcrest.Matcher

class SingleViewActionPerformer(
private val action: ViewAction
) : ViewActionPerformer {
override fun performOn(matcher: Matcher<View>): Any? {
onView(matcher).perform(action)
try {
onView(matcher).perform(action)
} catch (e: NoMatchingViewException) {
// Fallback: try dialog root (e.g. React Native Modal)
onView(matcher).inRoot(RootMatchers.isDialog()).perform(action)
}

return (action as? ViewActionWithResult<*>)?.getResult()
}
Expand Down