Updates based on CR feedback.

Author: jaclync

WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormViewController.swift

@@ -174,7 +174,7 @@ private extension ProductFormViewController {
         // Waits for all product images to be uploaded before updating the product remotely.
         group.enter()
         let observationToken = productImageActionHandler.addUpdateObserver(self) { [weak self] (productImageStatuses, error) in
-            guard productImageStatuses.hasImagesPendingUpload == false else {
+            guard productImageStatuses.hasPendingUpload == false else {
                 return
             }
 
@@ -423,7 +423,7 @@ extension ProductFormViewController {
     }
 
     private func hasUnsavedChanges(product: Product) -> Bool {
-        return product != originalProduct || productImageActionHandler.productImageStatuses.hasImagesPendingUpload
+        return product != originalProduct || productImageActionHandler.productImageStatuses.hasPendingUpload
     }
 }
 

WooCommerce/Classes/ViewRelated/Products/Media/ProductImageStatus.swift

@@ -27,7 +27,7 @@ extension Collection where Element == ProductImageStatus {
 
     /// Whether there are still any images being uploaded.
     ///
-    var hasImagesPendingUpload: Bool {
+    var hasPendingUpload: Bool {
         return contains(where: {
             switch $0 {
             case .uploading:

WooCommerce/Classes/ViewRelated/Products/Media/ProductImagesViewController.swift

@@ -190,7 +190,7 @@ extension ProductImagesViewController {
 
     private func hasOutstandingChanges() -> Bool {
         return originalProductImages != productImages
-            || productImageStatuses.hasImagesPendingUpload
+            || productImageStatuses.hasPendingUpload
     }
 }
 

WooCommerce/WooCommerceTests/ViewRelated/Products/Media/ProductImageStatus+HelpersTests.swift

@@ -7,14 +7,14 @@ import XCTest
 final class ProductImageStatus_HelpersTests: XCTestCase {
     // MARK: - `images`
 
-    func testWithoutRemoteImages() {
+    func testImagesReturnsEmptyIfThereAreNoRemoteImages() {
         let statuses: [ProductImageStatus] = [
             .uploading(asset: PHAsset())
         ]
         XCTAssertEqual(statuses.images, [])
     }
 
-    func testWithRemoteImages() {
+    func testImagesReturnsProductImagesIfThereAreRemoteImages() {
         let productImage = ProductImage(imageID: 17, dateCreated: Date(), dateModified: Date(), src: "", name: nil, alt: nil)
 
         let statuses: [ProductImageStatus] = [
@@ -24,27 +24,27 @@ final class ProductImageStatus_HelpersTests: XCTestCase {
         XCTAssertEqual(statuses.images, [productImage])
     }
 
-    // MARK: - `hasImagesPendingUpload`
+    // MARK: - `hasPendingUpload`
 
-    func testHasImagesPendingUploadWithNoImages() {
+    func testHasPendingUploadWithNoImages() {
         let statuses: [ProductImageStatus] = []
-        XCTAssertFalse(statuses.hasImagesPendingUpload)
+        XCTAssertFalse(statuses.hasPendingUpload)
     }
 
-    func testHasImagesPendingUploadWithAllRemoteImages() {
+    func testHasPendingUploadWithAllRemoteImages() {
         let productImage = ProductImage(imageID: 17, dateCreated: Date(), dateModified: Date(), src: "", name: nil, alt: nil)
 
         let statuses: [ProductImageStatus] = [.remote(image: productImage), .remote(image: productImage)]
-        XCTAssertFalse(statuses.hasImagesPendingUpload)
+        XCTAssertFalse(statuses.hasPendingUpload)
     }
 
-    func testHasImagesPendingUploadWithBothStatusTypes() {
+    func testHasPendingUploadWithBothStatusTypes() {
         let productImage = ProductImage(imageID: 17, dateCreated: Date(), dateModified: Date(), src: "", name: nil, alt: nil)
 
         let statuses: [ProductImageStatus] = [
             .uploading(asset: PHAsset()),
             .remote(image: productImage)
         ]
-        XCTAssertTrue(statuses.hasImagesPendingUpload)
+        XCTAssertTrue(statuses.hasPendingUpload)
     }
 }