From 00b09b7aaf51e5eefecefb34e1a8109df078c2b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Sta=C5=9B?= Date: Wed, 8 Apr 2020 13:55:34 +0200 Subject: [PATCH] Revert "Always resolve dismissAllModals promise (#6054)" This reverts commit a193c8f85c86e95a345a1adb5870b7f5711b34bd. --- .../viewcontrollers/modal/ModalStack.java | 1 - .../viewcontrollers/modal/ModalStackTest.java | 7 ------- .../viewcontrollers/navigator/NavigatorTest.java | 1 - 3 files changed, 9 deletions(-) diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java b/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java index af390f170b2..f60119e548a 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java +++ b/lib/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/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java b/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java index 00d20716232..543bf930eb7 100644 --- a/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java +++ b/lib/android/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/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java b/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java index 5fe3fae2c76..a9324ff2b8b 100644 --- a/lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/navigator/NavigatorTest.java +++ b/lib/android/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());