diff --git a/WooCommerce/Classes/GoogleAds/GoogleAdsEligibilityChecker.swift b/WooCommerce/Classes/GoogleAds/GoogleAdsEligibilityChecker.swift index a72f30b5249..e7841b3dabb 100644 --- a/WooCommerce/Classes/GoogleAds/GoogleAdsEligibilityChecker.swift +++ b/WooCommerce/Classes/GoogleAds/GoogleAdsEligibilityChecker.swift @@ -42,15 +42,6 @@ final class DefaultGoogleAdsEligibilityChecker: GoogleAdsEligibilityChecker { } private extension DefaultGoogleAdsEligibilityChecker { - @MainActor - func fetchPluginFromStorage(siteID: Int64) async -> SystemPlugin? { - await withCheckedContinuation { continuation in - stores.dispatch(SystemStatusAction.fetchSystemPluginWithPath(siteID: siteID, pluginPath: Constants.pluginSlug) { plugin in - continuation.resume(returning: plugin) - }) - } - } - @MainActor func fetchPluginFromRemote(siteID: Int64) async -> SystemPlugin? { await withCheckedContinuation { continuation in diff --git a/WooCommerce/WooCommerceTests/GoogleAds/DefaultGoogleAdsEligibilityCheckTests.swift b/WooCommerce/WooCommerceTests/GoogleAds/DefaultGoogleAdsEligibilityCheckTests.swift index 8c1eebfad37..9a90faff5b7 100644 --- a/WooCommerce/WooCommerceTests/GoogleAds/DefaultGoogleAdsEligibilityCheckTests.swift +++ b/WooCommerce/WooCommerceTests/GoogleAds/DefaultGoogleAdsEligibilityCheckTests.swift @@ -4,7 +4,7 @@ import Yosemite final class DefaultGoogleAdsEligibilityCheckerTests: XCTestCase { private let sampleSite: Int64 = 325 - private let pluginSlug = "google-listings-and-ads/google-listings-and-ads" + private let pluginSlug = "google-listings-and-ads/google-listings-and-ads.php" private var stores: MockStoresManager! @@ -36,7 +36,7 @@ final class DefaultGoogleAdsEligibilityCheckerTests: XCTestCase { // Given let featureFlagService = MockFeatureFlagService(googleAdsCampaignCreationOnWebView: true) let checker = DefaultGoogleAdsEligibilityChecker(stores: stores, featureFlagService: featureFlagService) - mockRequests(syncedPlugins: [], fetchedPluginWithPath: nil) + mockRequests(syncedPlugins: []) // When let result = await checker.isSiteEligible(siteID: sampleSite) @@ -71,7 +71,7 @@ final class DefaultGoogleAdsEligibilityCheckerTests: XCTestCase { plugin: pluginSlug, version: "2.7.4", active: true) - mockRequests(fetchedPluginWithPath: plugin) + mockRequests(syncedPlugins: [plugin]) // When let result = await checker.isSiteEligible(siteID: sampleSite) @@ -90,7 +90,7 @@ final class DefaultGoogleAdsEligibilityCheckerTests: XCTestCase { version: "2.7.5", active: true) let connection = GoogleAdsConnection.fake().copy(rawStatus: "incomplete") - mockRequests(fetchedPluginWithPath: plugin, adsConnection: connection) + mockRequests(syncedPlugins: [plugin], adsConnection: connection) // When let result = await checker.isSiteEligible(siteID: sampleSite) @@ -109,7 +109,7 @@ final class DefaultGoogleAdsEligibilityCheckerTests: XCTestCase { version: "2.7.5", active: true) let connection = GoogleAdsConnection.fake().copy(rawStatus: "connected") - mockRequests(fetchedPluginWithPath: plugin, adsConnection: connection) + mockRequests(syncedPlugins: [plugin], adsConnection: connection) // When let result = await checker.isSiteEligible(siteID: sampleSite) @@ -122,15 +122,12 @@ final class DefaultGoogleAdsEligibilityCheckerTests: XCTestCase { // MARK: - Helpers private extension DefaultGoogleAdsEligibilityCheckerTests { func mockRequests(syncedPlugins: [SystemPlugin] = [], - fetchedPluginWithPath: SystemPlugin? = nil, adsConnection: GoogleAdsConnection? = nil) { stores.whenReceivingAction(ofType: SystemStatusAction.self) { action in switch action { case let .synchronizeSystemInformation(_, onCompletion): let systemInfo = SystemInformation.fake().copy(systemPlugins: syncedPlugins) onCompletion(.success(systemInfo)) - case let .fetchSystemPluginWithPath(_, _, onCompletion): - onCompletion(fetchedPluginWithPath) default: break }