Merge branch 'trunk' into feat/WOOMOB-611-cache-pos-eligibility

# Conflicts:
#	WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Author: jaclync

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -97,8 +97,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .searchProductsInPOSPt2PopularProducts:
             return true
-        case .searchCouponsInPOS:
-            return true
         case .inventoryProductLabelsInPOS:
             return false
         case .pointOfSaleReceipts:

Modules/Sources/Experiments/FeatureFlag.swift

@@ -209,10 +209,6 @@ public enum FeatureFlag: Int {
     ///
     case searchProductsInPOSPt2PopularProducts
 
-    /// Allows searching coupons in POS
-    ///
-    case searchCouponsInPOS
-
     /// Enables optimized handling of product images
     ///
     case productImageOptimizedHandling

Modules/Sources/XcodeSupport/XcodeTarget_Experiments/Empty.swift

@@ -12,10 +12,10 @@ final class URLRequestConvertible_PathTests: XCTestCase {
     // MARK: - `pathForAnalytics`
 
     // Example from `ProductsRemote.loadAllProducts`.
-    func test_pathForAnalytics_returns_path_of_JetpackRequest() throws {
+    func test_pathForAnalytics_returns_path_of_JetpackRequest() async throws {
         // Given
         let productsRemote = ProductsRemote(network: network)
-        productsRemote.loadAllProducts(for: 134, completion: { _ in })
+        _ = try? await productsRemote.loadAllProducts(for: 134)
 
         // When
         let request = try XCTUnwrap(network.requestsForResponseData.first)

Modules/Sources/XcodeSupport/XcodeTarget_ExperimentsTests/Empty.swift

@@ -256,39 +256,28 @@ final class ProductsRemoteTests: XCTestCase {
 
     /// Verifies that loadAllProducts properly parses the `products-load-all` sample response.
     ///
-    func testLoadAllProductsProperlyReturnsParsedProducts() {
+    func test_loadAllProducts_properly_returns_parsed_products() async throws {
+        // Given
         let remote = ProductsRemote(network: network)
-        let expectation = self.expectation(description: "Load All Products")
-
         network.simulateResponse(requestUrlSuffix: "products", filename: "products-load-all")
 
-        remote.loadAllProducts(for: sampleSiteID) { result in
-            switch result {
-            case .success(let products):
-                XCTAssertEqual(products.count, 10)
-            default:
-                XCTFail("Unexpected result: \(result)")
-            }
-            expectation.fulfill()
-        }
+        // When
+        let products = try await remote.loadAllProducts(for: sampleSiteID)
 
-        wait(for: [expectation], timeout: Constants.expectationTimeout)
+        // Then
+        XCTAssertEqual(products.count, 10)
     }
 
     /// Verifies that loadAllProducts with `excludedProductIDs` makes a network request with the corresponding parameter.
     ///
-    func testLoadAllProductsWithExcludedIDsIncludesAnExcludeParamInNetworkRequest() throws {
+    func test_loadAllProducts_with_excluded_ids_includes_an_exclude_param_in_network_request() async throws {
         // Arrange
         let remote = ProductsRemote(network: network)
         network.simulateResponse(requestUrlSuffix: "products", filename: "products-load-all")
         let excludedProductIDs: [Int64] = [17, 671]
 
         // Action
-        waitForExpectation { expectation in
-            remote.loadAllProducts(for: sampleSiteID, excludedProductIDs: excludedProductIDs) { result in
-                expectation.fulfill()
-            }
-        }
+        _ = try await remote.loadAllProducts(for: sampleSiteID, excludedProductIDs: excludedProductIDs)
 
         // Assert
         let queryParameters = try XCTUnwrap(network.queryParameters)
@@ -298,18 +287,14 @@ final class ProductsRemoteTests: XCTestCase {
 
     /// Verifies that loadAllProducts with `productIDs` makes a network request with the `include` parameter.
     ///
-    func test_loadAllProducts_with_productIDs_adds_a_include_param_in_network_request() throws {
+    func test_loadAllProducts_with_productIDs_adds_a_include_param_in_network_request() async throws {
         // Given
         let remote = ProductsRemote(network: network)
         network.simulateResponse(requestUrlSuffix: "products", filename: "products-load-all")
         let productIDs: [Int64] = [13, 61]
 
         // When
-        waitForExpectation { expectation in
-            remote.loadAllProducts(for: sampleSiteID, productIDs: productIDs) { result in
-                expectation.fulfill()
-            }
-        }
+        _ = try await remote.loadAllProducts(for: sampleSiteID, productIDs: productIDs)
 
         // Then
         let queryParameters = try XCTUnwrap(network.queryParameters)
@@ -319,17 +304,13 @@ final class ProductsRemoteTests: XCTestCase {
 
     /// Verifies that loadAllProducts with empty `productIDs` makes a network request without the `include` parameter.
     ///
-    func test_loadAllProducts_with_empty_productIDs_does_not_add_include_param_in_network_request() throws {
+    func test_loadAllProducts_with_empty_productIDs_does_not_add_include_param_in_network_request() async throws {
         // Given
         let remote = ProductsRemote(network: network)
         network.simulateResponse(requestUrlSuffix: "products", filename: "products-load-all")
 
         // When
-        waitForExpectation { expectation in
-            remote.loadAllProducts(for: sampleSiteID, productIDs: []) { result in
-                expectation.fulfill()
-            }
-        }
+        _ = try await remote.loadAllProducts(for: sampleSiteID, productIDs: [])
 
         // Then
         let queryParameters = try XCTUnwrap(network.queryParameters)
@@ -339,21 +320,16 @@ final class ProductsRemoteTests: XCTestCase {
 
     /// Verifies that loadAllProducts properly relays Networking Layer errors.
     ///
-    func test_loadAllProducts_properly_relays_netwoking_errors() {
+    func test_loadAllProducts_properly_relays_netwoking_errors() async {
+        // Given
         let remote = ProductsRemote(network: network)
-        let expectation = self.expectation(description: "Load all products returns error")
-
-        remote.loadAllProducts(for: sampleSiteID) { result in
-            switch result {
-            case .failure:
-                break
-            default:
-                XCTFail("Unexpected result: \(result)")
-            }
-            expectation.fulfill()
-        }
 
-        wait(for: [expectation], timeout: Constants.expectationTimeout)
+        do {
+            _ = try await remote.loadAllProducts(for: sampleSiteID)
+            XCTFail("Expected error to be thrown")
+        } catch {
+            XCTAssertEqual(error as? NetworkError, .notFound())
+        }
     }
 
 

Networking/NetworkingTests/Extensions/URLRequestConvertible+PathTests.swift

@@ -20,8 +20,7 @@ public protocol ProductsRemoteProtocol {
                          orderBy: ProductsRemote.OrderKey,
                          order: ProductsRemote.Order,
                          productIDs: [Int64],
-                         excludedProductIDs: [Int64],
-                         completion: @escaping (Result<[Product], Error>) -> Void)
+                         excludedProductIDs: [Int64]) async throws -> [Product]
     func searchProducts(for siteID: Int64,
                         keyword: String,
                         pageNumber: Int,
@@ -179,8 +178,7 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
                                 orderBy: OrderKey = .name,
                                 order: Order = .ascending,
                                 productIDs: [Int64] = [],
-                                excludedProductIDs: [Int64] = [],
-                                completion: @escaping (Result<[Product], Error>) -> Void) {
+                                excludedProductIDs: [Int64] = []) async throws -> [Product] {
         let stringOfExcludedProductIDs = excludedProductIDs.map { String($0) }
             .joined(separator: ",")
         let stringOfProductIDs: String = {
@@ -211,9 +209,9 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
 
         let path = Path.products
         let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: path, parameters: parameters, availableAsRESTRequest: true)
-        let mapper = ProductListMapper(siteID: siteID)
+        let mapper = ListMapper<Product>(siteID: siteID)
 
-        enqueue(request, mapper: mapper, completion: completion)
+        return try await enqueue(request, mapper: mapper)
     }
 
     /// Retrieves products for the Point of Sale. Simple and variable products are loaded for WC version 9.6+, otherwise only simple products are loaded.

Networking/NetworkingTests/Remote/ProductsRemoteTests.swift

@@ -301,12 +301,6 @@ extension UIImage {
         return UIImage.gridicon(.cross, size: CGSize(width: 22, height: 22))
     }
 
-    /// Domain credit image.
-    ///
-    static var domainCreditImage: UIImage {
-        return UIImage(named: "domain-credit")!
-    }
-
     /// Domain purchase success image.
     ///
     static var domainPurchaseSuccessImage: UIImage {

Networking/Sources/Extended/Remote/ProductsRemote.swift

@@ -54,10 +54,6 @@ struct ItemListView: View {
         ServiceLocator.featureFlagService.isFeatureFlagEnabled(.searchProductsInPOS)
     }
 
-    private var isSearchCouponsFeatureEnabled: Bool {
-        ServiceLocator.featureFlagService.isFeatureFlagEnabled(.searchCouponsInPOS)
-    }
-
     private var isBarcodeScani1FeatureEnabled: Bool {
         ServiceLocator.featureFlagService.isFeatureFlagEnabled(.pointOfSaleBarcodeScanningi1)
     }
@@ -77,7 +73,7 @@ struct ItemListView: View {
         case .products:
             return isSearchProductsFeatureEnabled
         case .coupons:
-            return isSearchCouponsFeatureEnabled
+            return true
         }
     }