Send load accounts in a dispatch group. Update tests

Author: ctarda

Networking/NetworkingTests/Remote/StripeRemoteTests.swift

@@ -305,8 +305,8 @@ final class StripeRemoteTests: XCTestCase {
         // Then
         XCTAssertTrue(result.isSuccess)
         let account = try result.get()
-        XCTAssertEqual(account.isLiveAccount, true)
-        XCTAssertEqual(account.isInTestMode, false)
+        XCTAssertEqual(account.isLiveAccount, false)
+        XCTAssertEqual(account.isInTestMode, true)
     }
 
     /// Properly decodes live account in test mode stripe-account-live-test
@@ -327,7 +327,7 @@ final class StripeRemoteTests: XCTestCase {
         // Then
         XCTAssertTrue(result.isSuccess)
         let account = try result.get()
-        XCTAssertEqual(account.isLiveAccount, true)
+        XCTAssertEqual(account.isLiveAccount, false)
         XCTAssertEqual(account.isInTestMode, true)
     }
 

Yosemite/Yosemite/Stores/CardPresentPaymentStore.swift

@@ -409,8 +409,40 @@ private extension CardPresentPaymentStore {
     /// Loads the account corresponding to the currently selected backend. Deletes the other (if it exists).
     ///
     func loadAccounts(siteID: Int64, onCompletion: @escaping (Result<Void, Error>) -> Void) {
-        loadWCPayAccount(siteID: siteID, onCompletion: onCompletion)
-        loadStripeAccount(siteID: siteID, onCompletion: onCompletion)
+        var error: Error? = nil
+
+        let group = DispatchGroup()
+        group.enter()
+        loadWCPayAccount(siteID: siteID, onCompletion: { result in
+            switch result {
+            case .failure(let loadError):
+                DDLogError("⛔️ Error synchronizing WCPay Account: \(loadError)")
+                error = loadError
+            case .success():
+                break
+            }
+            group.leave()
+        })
+
+        group.enter()
+        loadStripeAccount(siteID: siteID, onCompletion: {result in
+            switch result {
+            case .failure(let loadError):
+                DDLogError("⛔️ Error synchronizing Stripe Account: \(loadError)")
+                error = loadError
+            case .success():
+                break
+            }
+            group.leave()
+        })
+
+        group.notify(queue: .main) {
+            guard let error = error else {
+                onCompletion(.success(()))
+                return
+            }
+            onCompletion(.failure(error))
+        }
     }
 
     func loadWCPayAccount(siteID: Int64, onCompletion: @escaping (Result<Void, Error>) -> Void) {

Yosemite/YosemiteTests/Stores/CardPresentPaymentStoreTests.swift

@@ -263,6 +263,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
                                             allowStripeIPP: false)
         let expectation = self.expectation(description: "Load Account error response")
         network.simulateResponse(requestUrlSuffix: "payments/accounts", filename: "generic_error")
+        network.simulateResponse(requestUrlSuffix: "wc_stripe/account/summary", filename: "generic_error")
 
         let action = CardPresentPaymentAction.loadAccounts(siteID: sampleSiteID, onCompletion: { result in
             XCTAssertTrue(result.isFailure)
@@ -285,6 +286,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
                                             allowStripeIPP: false)
         let expectation = self.expectation(description: "Load Account fetch response")
         network.simulateResponse(requestUrlSuffix: "payments/accounts", filename: "wcpay-account-complete")
+        network.simulateResponse(requestUrlSuffix: "wc_stripe/account/summary", filename: "stripe-account-complete")
         let action = CardPresentPaymentAction.loadAccounts(siteID: sampleSiteID, onCompletion: { result in
             XCTAssertTrue(result.isSuccess)
             expectation.fulfill()
@@ -293,7 +295,7 @@ final class CardPresentPaymentStoreTests: XCTestCase {
         store.onAction(action)
         wait(for: [expectation], timeout: Constants.expectationTimeout)
 
-        XCTAssert(viewStorage.countObjects(ofType: Storage.PaymentGatewayAccount.self, matching: nil) == 1)
+        XCTAssert(viewStorage.countObjects(ofType: Storage.PaymentGatewayAccount.self, matching: nil) == 2)
 
         let storageAccount = viewStorage.loadPaymentGatewayAccount(
             siteID: sampleSiteID,