Revert "Always resolve dismissAllModals promise (wix#6054)"

This reverts commit a193c8f.
stachu2k · Apr 8, 2020 · 00b09b7 · 00b09b7
1 parent d2d94a6
commit 00b09b7
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 9 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,7 +84,6 @@ 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,13 +173,6 @@ 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,7 +596,6 @@ 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());