Added another order storage unit test.

Author: bummytime

Yosemite/Yosemite/Stores/OrderStore.swift

@@ -80,10 +80,9 @@ private extension OrderStore {
 
         let storage = storageManager.viewStorage
         let storageOrder = storage.loadOrder(orderID: readOnlyOrder.orderID) ?? storage.insertNewObject(ofType: Storage.Order.self)
-
-        // TODO: items & coupons
-
         storageOrder.update(with: readOnlyOrder)
+        handleOrderItems(readOnlyOrder, storageOrder, storage)
+        handleOrderCoupons(readOnlyOrder, storageOrder, storage)
         storage.saveIfNeeded()
     }
 
@@ -103,7 +102,7 @@ private extension OrderStore {
         storage.saveIfNeeded()
     }
 
-    /// Updates, inserts, and prunes the provided StorageOrder's items using the provided read-only Order's items
+    /// Updates, inserts, or prunes the provided StorageOrder's items using the provided read-only Order's items
     ///
     func handleOrderItems(_ readOnlyOrder: Networking.Order, _ storageOrder: Storage.Order, _ storage: StorageType) {
         guard !readOnlyOrder.items.isEmpty else {
@@ -131,7 +130,7 @@ private extension OrderStore {
         })
     }
 
-    /// Updates, inserts, and prunes the provided StorageOrder's coupons using the provided read-only Order's coupons
+    /// Updates, inserts, or prunes the provided StorageOrder's coupons using the provided read-only Order's coupons
     ///
     func handleOrderCoupons(_ readOnlyOrder: Networking.Order, _ storageOrder: Storage.Order, _ storage: StorageType) {
         guard !readOnlyOrder.coupons.isEmpty else {

Yosemite/YosemiteTests/Stores/OrderStoreTests.swift

@@ -80,7 +80,7 @@ class OrderStoreTests: XCTestCase {
 
     /// Verifies that `OrderAction.retrieveOrders` effectively persists all of the order fields correctly across all of the related Order objects (items, coupons, etc).
     ///
-    func testRetrieveOrdersEffectivelyPersistsOrderFields() {
+    func testRetrieveOrdersEffectivelyPersistsOrderFieldsAndRelatedObjects() {
         let expectation = self.expectation(description: "Persist order list")
         let orderStore = OrderStore(dispatcher: dispatcher, storageManager: storageManager, network: network)
         let remoteOrder = sampleOrder()
@@ -89,7 +89,9 @@ class OrderStoreTests: XCTestCase {
         XCTAssertEqual(viewStorage.countObjects(ofType: Storage.Order.self), 0)
 
         let action = OrderAction.retrieveOrders(siteID: 123) { (orders, error) in
+            XCTAssertNotNil(orders)
             XCTAssertNil(error)
+
             let predicate = NSPredicate(format: "orderID = %ld", remoteOrder.orderID)
             let storedOrder = self.viewStorage.firstObject(ofType: Storage.Order.self, matching: predicate)
             let readOnlyStoredOrder = storedOrder?.toReadOnly()
@@ -170,6 +172,34 @@ class OrderStoreTests: XCTestCase {
         wait(for: [expectation], timeout: Constants.expectationTimeout)
     }
 
+    /// Verifies that `OrderAction.retrieveOrder` effectively persists all of the remote order fields correctly across all of the related `Order` objects (items, coupons, etc).
+    ///
+    func testRetrieveSingleOrderEffectivelyPersistsOrderFieldsAndRelatedObjects() {
+        let expectation = self.expectation(description: "Persist order")
+        let orderStore = OrderStore(dispatcher: dispatcher, storageManager: storageManager, network: network)
+        let remoteOrder = sampleOrder()
+
+        network.simulateResponse(requestUrlSuffix: "orders/963", filename: "order")
+        XCTAssertEqual(viewStorage.countObjects(ofType: Storage.Order.self), 0)
+
+        let action = OrderAction.retrieveOrder(siteID: 123, orderID: 963) { (order, error) in
+            XCTAssertNotNil(order)
+            XCTAssertNil(error)
+
+            let predicate = NSPredicate(format: "orderID = %ld", remoteOrder.orderID)
+            let storedOrder = self.viewStorage.firstObject(ofType: Storage.Order.self, matching: predicate)
+            let readOnlyStoredOrder = storedOrder?.toReadOnly()
+            XCTAssertNotNil(storedOrder)
+            XCTAssertNotNil(readOnlyStoredOrder)
+            XCTAssertEqual(readOnlyStoredOrder, remoteOrder)
+
+            expectation.fulfill()
+        }
+
+        orderStore.onAction(action)
+        wait(for: [expectation], timeout: Constants.expectationTimeout)
+    }
+
     /// Verifies that OrderAction.retrieveOrder returns an error whenever there is an error response from the backend.
     ///
     func testRetrieveSingleOrderReturnsErrorUponReponseError() {