Adjust DeckListNavigator

dogo · Feb 22, 2024 · f27d947 · f27d947
1 parent 7da4722
commit f27d947
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/SWDestinyTrades/Classes/DeckList/Navigator/DeckListNavigator.swift b/SWDestinyTrades/Classes/DeckList/Navigator/DeckListNavigator.swift
@@ -14,19 +14,18 @@ final class DeckListNavigator: Navigator {
         case deckBuilder(database: DatabaseProtocol?, with: DeckDTO)
     }
 
-    private weak var navigationController: UINavigationController?
+    private weak var viewController: UIViewController?
 
     // MARK: - Initializer
 
-    init(_ navigationController: UINavigationController?) {
-        self.navigationController = navigationController
+    init(_ viewController: UIViewController?) {
+        self.viewController = viewController
     }
 
     // MARK: - Navigator
 
     func navigate(to destination: Destination) {
-        let viewController = makeViewController(for: destination)
-        navigationController?.pushViewController(viewController, animated: true)
+        viewController?.navigationController?.pushViewController(makeViewController(for: destination), animated: true)
     }
 
     // MARK: - Private

diff --git a/SWDestinyTradesTests/Screens/DeckList/Navigator/DeckListNavigatorTests.swift b/SWDestinyTradesTests/Screens/DeckList/Navigator/DeckListNavigatorTests.swift
@@ -18,11 +18,18 @@ final class DeckListNavigatorTests: XCTestCase {
 
     override func setUp() {
         super.setUp()
-        navigationController = UINavigationControllerMock()
-        sut = DeckListNavigator(navigationController)
+        let controller = UIViewController()
+        navigationController = UINavigationControllerMock(rootViewController: controller)
+        sut = DeckListNavigator(controller)
     }
 
-    func testNavigateToDeckBuilderViewController() {
+    override func tearDown() {
+        navigationController = nil
+        sut = nil
+        super.tearDown()
+    }
+
+    func test_navigate_to_deckBuilderViewController() {
         sut.navigate(to: .deckBuilder(database: nil, with: .stub()))
 
         XCTAssertTrue(navigationController.currentPushedViewController is DeckBuilderViewController)