Skip to content

Re-enable connection controller tests #15749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 16, 2025
Merged

Re-enable connection controller tests #15749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
663496a
Re-enable connection controller tests
joshheald Jun 13, 2025
c26d4f7
Use undeprecated database save function
joshheald Jun 13, 2025
4fd5589
Improve mock readability
joshheald Jun 13, 2025
824e0a2
Temporarily retry the skipped tests 50 times.
joshheald Jun 13, 2025
1fd2921
Revert "Temporarily retry the skipped tests 50 times."
joshheald Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 21 additions & 39 deletions WooCommerce/WooCommerceTests/Mocks/MockCardReaderSettingsAlerts.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ extension MockCardReaderSettingsAlerts: BluetoothReaderConnnectionAlertsProvidin
typealias AlertDetails = CardPresentPaymentsModalViewModel

func scanningForReader(cancel: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
if mode == .cancelScanning {
switch mode {
case .cancelScanning:
cancel()
}

if mode == .continueSearchingAfterConnectionFailure {
case .continueSearchingAfterConnectionFailure:
/// If we've already presented a found reader once before, cancel this second search
///
if didPresentFoundReader {
cancel()
}
default:
break
}

return MockCardPresentPaymentsModalViewModel()
Expand Down Expand Up @@ -92,13 +92,7 @@ extension MockCardReaderSettingsAlerts: BluetoothReaderConnnectionAlertsProvidin
func connectingFailed(error: Error,
retrySearch: @escaping () -> Void,
cancelSearch: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
if mode == .continueSearchingAfterConnectionFailure {
retrySearch()
}

if mode == .cancelSearchingAfterConnectionFailure {
cancelSearch()
}
retryOrCancelIfNeeded(retry: retrySearch, cancel: cancelSearch)
return MockCardPresentPaymentsModalViewModel()
}

Expand All @@ -107,37 +101,19 @@ extension MockCardReaderSettingsAlerts: BluetoothReaderConnnectionAlertsProvidin
openWCSettings: (() -> Void)?,
retrySearch: @escaping () -> Void,
cancelSearch: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
if mode == .continueSearchingAfterConnectionFailure {
retrySearch()
}

if mode == .cancelSearchingAfterConnectionFailure {
cancelSearch()
}
retryOrCancelIfNeeded(retry: retrySearch, cancel: cancelSearch)
return MockCardPresentPaymentsModalViewModel()
}

func connectingFailedInvalidPostalCode(retrySearch: @escaping () -> Void,
cancelSearch: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
if mode == .continueSearchingAfterConnectionFailure {
retrySearch()
}

if mode == .cancelSearchingAfterConnectionFailure {
cancelSearch()
}
retryOrCancelIfNeeded(retry: retrySearch, cancel: cancelSearch)
return MockCardPresentPaymentsModalViewModel()
}

func connectingFailedCriticallyLowBattery(retrySearch: @escaping () -> Void,
cancelSearch: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
if mode == .continueSearchingAfterConnectionFailure {
retrySearch()
}

if mode == .cancelSearchingAfterConnectionFailure {
cancelSearch()
}
retryOrCancelIfNeeded(retry: retrySearch, cancel: cancelSearch)
return MockCardPresentPaymentsModalViewModel()
}

Expand All @@ -149,12 +125,7 @@ extension MockCardReaderSettingsAlerts: BluetoothReaderConnnectionAlertsProvidin
func updatingFailedLowBattery(batteryLevel: Double?,
retrySearch: @escaping () -> Void,
close: @escaping () -> Void) -> CardPresentPaymentsModalViewModel {
if mode == .continueSearchingAfterConnectionFailure {
retrySearch()
}
if mode == .cancelSearchingAfterConnectionFailure {
close()
}
retryOrCancelIfNeeded(retry: retrySearch, cancel: close)
return MockCardPresentPaymentsModalViewModel()
}

Expand Down Expand Up @@ -188,6 +159,17 @@ extension MockCardReaderSettingsAlerts: BluetoothReaderConnnectionAlertsProvidin
}
return MockCardPresentPaymentsModalViewModel()
}

private func retryOrCancelIfNeeded(retry: @escaping () -> Void, cancel: @escaping () -> Void) {
switch mode {
case .cancelSearchingAfterConnectionFailure:
cancel()
case .continueSearchingAfterConnectionFailure:
retry()
default:
break
}
}
}


Expand Down
1 change: 0 additions & 1 deletion WooCommerce/WooCommerceTests/UnitTests.xctestplan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
},
{
"skippedTests" : [
"CardReaderConnectionControllerTests",
"InAppPurchaseStoreTests",
"InAppPurchaseStoreTests\/test_iap_supported_in_canada()",
"InAppPurchaseStoreTests\/test_iap_supported_in_us()",
Expand Down
9 changes: 5 additions & 4 deletions ...ooCommerceTests/ViewRelated/CardPresentPayments/CardReaderConnectionControllerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ final class CardReaderConnectionControllerTests: XCTestCase {
storageManager = MockStorageManager()
locationService = MockLocationService(status: .authorized)

let paymentGateway = storageManager.viewStorage.insertNewObject(ofType: StoragePaymentGatewayAccount.self)
paymentGateway.update(with: .fake().copy(siteID: sampleSiteID, gatewayID: "woocommerce-payments", isCardPresentEligible: true))
storageManager.viewStorage.saveIfNeeded()

storageManager.performAndSave({ [weak self] storage in
guard let self else { return }
let paymentGateway = storageManager.viewStorage.insertNewObject(ofType: StoragePaymentGatewayAccount.self)
paymentGateway.update(with: .fake().copy(siteID: sampleSiteID, gatewayID: "woocommerce-payments", isCardPresentEligible: true))
}, completion: nil, on: .main)

analyticsProvider = MockAnalyticsProvider()
analytics = WooAnalytics(analyticsProvider: analyticsProvider)
Expand Down