Skip to content
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

Jump to bottom

Always resolve dismissAllModals promise #6054

Merged
merged 2 commits into from
Mar 18, 2020
Merged

Always resolve dismissAllModals promise #6054

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f92cfc
Always resolve dismissAllModalsPromise
guyca Mar 18, 2020
c851265
Fixe tests
guyca Mar 18, 2020
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
1 change: 1 addition & 0 deletions ...android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public void onSuccess(String childId) {

public void dismissAllModals(ViewController root, Options mergeOptions, CommandListener listener) {
if (modals.isEmpty()) {
listener.onSuccess(root.getId());
return;
}
String topModalId = peek().getId();
Expand Down
7 changes: 7 additions & 0 deletions ...oid/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,13 @@ public void onSuccess(String childId) {
verifyZeroInteractions(listener);
}

@Test
public void dismissAllModals_rejectIfEmpty() {
guyca marked this conversation as resolved.
Show resolved Hide resolved
CommandListener spy = spy(new CommandListenerAdapter());
uut.dismissAllModals(root, Options.EMPTY, spy);
verify(spy, times(1)).onSuccess(root.getId());
}

@Test
public void dismissAllModals_optionsAreMergedOnTopModal() {
uut.showModal(modal1, root, new CommandListenerAdapter());
Expand Down