Skip to content

Commit e931cbe

Browse files
committed
Fix crash from ServiceLocator.grdbManager when feature flag is disabled by only resetting ServiceLocator.grdbManager when feature flag is enabled. MockStoresManager.deauthenticate depends on DefaultStoresManager implementation for some auth related test cases.
1 parent 0ee71db commit e931cbe

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

WooCommerce/Classes/Yosemite/DefaultStoresManager.swift

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,15 @@ class DefaultStoresManager: StoresManager {
269269
ServiceLocator.analytics.refreshUserData()
270270
ZendeskProvider.shared.reset()
271271
ServiceLocator.storageManager.reset()
272-
do {
273-
try ServiceLocator.grdbManager.reset()
274-
} catch {
275-
DDLogError("Could not reset GRDB database: \(error)")
272+
273+
if ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleLocalCatalogi1) {
274+
do {
275+
try ServiceLocator.grdbManager.reset()
276+
} catch {
277+
DDLogError("Could not reset GRDB database: \(error)")
278+
}
276279
}
280+
277281
ServiceLocator.productImageUploader.reset()
278282

279283
updateAndReloadWidgetInformation(with: nil)

WooCommerce/WooCommerceTests/Mocks/MockStoresManager.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ final class MockStoresManager: DefaultStoresManager {
5050
func reset() {
5151
receivedActions = []
5252
}
53-
54-
override func deauthenticate() -> any StoresManager {
55-
self
56-
}
5753
}
5854

5955
// MARK: - Mocking

0 commit comments

Comments
 (0)