BIT-174 Removes optional child navigators

bitwarden · Sep 5, 2023 · 0faa907 · 0faa907
1 parent 4dddce6
commit 0faa907
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/BitwardenShared/UI/Platform/Application/Utilities/RootNavigator.swift b/BitwardenShared/UI/Platform/Application/Utilities/RootNavigator.swift
@@ -9,7 +9,7 @@ public protocol RootNavigator: Navigator {
     /// Shows the specified child navigator.
     ///
     /// - Parameter child: The navigator to show.
-    func show(child: Navigator?)
+    func show(child: Navigator)
 }
 
 // MARK: - RootViewController
@@ -19,7 +19,7 @@ extension RootViewController: RootNavigator {
         self
     }
 
-    public func show(child: Navigator?) {
-        childViewController = child?.rootViewController
+    public func show(child: Navigator) {
+        childViewController = child.rootViewController
     }
 }
diff --git a/BitwardenShared/UI/Platform/Application/Utilities/RootViewControllerTests.swift b/BitwardenShared/UI/Platform/Application/Utilities/RootViewControllerTests.swift
@@ -54,4 +54,12 @@ class RootViewControllerTests: BitwardenTestCase {
         subject.childViewController = viewController
         XCTAssertIdentical(subject.rootViewController, subject)
     }
+
+    /// `show(child:)` sets `childViewController` to the `rootViewController` on the child navigator.
+    func test_show() {
+        let navigator = MockStackNavigator()
+        navigator.rootViewController = UIViewController()
+        subject.show(child: navigator)
+        XCTAssertIdentical(subject.childViewController, navigator.rootViewController)
+    }
 }
diff --git a/GlobalTestHelpers/MockRootNavigator.swift b/GlobalTestHelpers/MockRootNavigator.swift
@@ -5,7 +5,7 @@ final class MockRootNavigator: RootNavigator {
     var navigatorShown: Navigator?
     var rootViewController: UIViewController?
 
-    func show(child: Navigator?) {
+    func show(child: Navigator) {
         navigatorShown = child
     }
 }