Always resolve dismissAllModals promise (#6054)

When no modals are displayed and dismissAllModals is called, resolve the promise successfully. This regression was introduced in #5991
wix · Mar 18, 2020 · ec03383 · ec03383
1 parent 6046372
commit ec03383
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/...android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java b/...android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java
@@ -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();

diff --git a/...oid/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java b/...oid/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java
@@ -173,6 +173,13 @@ public void onSuccess(String childId) {
         verifyZeroInteractions(listener);
     }
 
+    @Test
+    public void dismissAllModals_resolveSuccessfullyIfEmpty() {
+        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());

diff --git a/.../app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java b/.../app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java
@@ -596,6 +596,7 @@ public void dismissModal_rejectIfRootIsNotSetAndSingleModalIsDisplayed() {
     public void dismissAllModals_onViewAppearedInvokedOnRoot() {
         disablePushAnimation(child2);
         disableShowModalAnimation(child1);
+        uut.setRoot(child3, new CommandListenerAdapter(), reactInstanceManager);
 
         uut.dismissAllModals(Options.EMPTY, new CommandListenerAdapter());
         verify(parentVisibilityListener, times(0)).onViewAppeared(parentController.getView());