-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #75 from iZettle/fix-double-dismiss-item-setup
Fix double dismiss item setup
- Loading branch information
Showing
7 changed files
with
100 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // | ||
| // Copyright © 2021 PayPal Inc. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
| import Flow | ||
| @testable import Presentation | ||
|
|
||
| class PresentationStyleTests: XCTestCase { | ||
|
|
||
| // MARK: - Dismissal Setup | ||
|
|
||
| func testModalPresentationDismissalSetup_forNavigationController_rootWithDismiss() { | ||
| let viewController = UIViewController() | ||
| viewController.dismissBarItem = .dummy | ||
| let navigationController = UINavigationController(rootViewController: viewController) | ||
|
|
||
| _ = PresentationStyle.modalPresentationDismissalSetup(for: navigationController, options: .defaults) | ||
|
|
||
| waitForNextrunLoop() | ||
|
|
||
| XCTAssertNil(navigationController.navigationItem.leftBarButtonItems) | ||
| XCTAssertEqual(viewController.navigationItem.leftBarButtonItems?.count, 1) | ||
| } | ||
|
|
||
| func testModalPresentationDismissalSetup_forNavigationController_withDismiss() { | ||
| let viewController = UIViewController() | ||
| let navigationController = UINavigationController(rootViewController: viewController) | ||
| navigationController.dismissBarItem = .dummy | ||
|
|
||
| _ = PresentationStyle.modalPresentationDismissalSetup(for: navigationController, options: .defaults) | ||
|
|
||
| waitForNextrunLoop() | ||
|
|
||
| XCTAssertNil(navigationController.navigationItem.leftBarButtonItems) | ||
| XCTAssertEqual(viewController.navigationItem.leftBarButtonItems?.count, 1) | ||
| } | ||
|
|
||
| func testModalPresentationDismissalSetup_forVCInNavController_withDismiss() { | ||
| let viewController = UIViewController() | ||
| viewController.dismissBarItem = .dummy | ||
| let navigationController = UINavigationController(rootViewController: viewController) | ||
|
|
||
| _ = PresentationStyle.modalPresentationDismissalSetup(for: viewController, options: .defaults) | ||
|
|
||
| waitForNextrunLoop() | ||
|
|
||
| XCTAssertNil(navigationController.navigationItem.leftBarButtonItems) | ||
| XCTAssertEqual(viewController.navigationItem.leftBarButtonItems?.count, 1) | ||
| } | ||
|
|
||
| func testModalPresentationDismissalSetup_forVCInNavController_withoutDismiss() { | ||
| let viewController = UIViewController() | ||
| let navigationController = UINavigationController(rootViewController: viewController) | ||
|
|
||
| _ = PresentationStyle.modalPresentationDismissalSetup(for: viewController, options: .defaults) | ||
|
|
||
| waitForNextrunLoop() | ||
|
|
||
| XCTAssertNil(navigationController.navigationItem.leftBarButtonItems) | ||
| XCTAssertNil(viewController.navigationItem.leftBarButtonItems) | ||
| } | ||
|
|
||
| private func waitForNextrunLoop() { | ||
| let nextRunLoop = expectation(description: "nextRunLoop") | ||
| Future().delay(by: 0).onValue { | ||
| nextRunLoop.fulfill() | ||
| } | ||
| wait(for: [nextRunLoop], timeout: 0.1) | ||
| } | ||
| } | ||
|
|
||
| extension UIBarButtonItem { | ||
| fileprivate static var dummy: UIBarButtonItem { | ||
| UIBarButtonItem(title: "Close", style: .plain, target: nil, action: nil) | ||
| } | ||
| } |