Merge pull request #8407 from woocommerce/add-virtual-product-ui-test

jostnes · web-flow · commit c2bb7fef484e · 2022-12-15T14:23:07.000+08:00
[UI Test] - Add validation on new product screen and new add product tests
diff --git a/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift b/WooCommerce/Classes/ViewRelated/Products/Edit Product/ProductFormTableViewDataSource.swift
@@ -271,6 +271,7 @@ private extension ProductFormTableViewDataSource {
                        ratingCount: ratingCount,
                        averageRating: averageRating)
         cell.accessoryType = .disclosureIndicator
+        cell.accessibilityIdentifier = "product-review-cell"
     }
 
     func configureSettingsRowWithASwitch(cell: UITableViewCell, viewModel: ProductFormSection.SettingsRow.SwitchableViewModel) {
diff --git a/WooCommerce/UITestsFoundation/Screens/Products/ProductsScreen.swift b/WooCommerce/UITestsFoundation/Screens/Products/ProductsScreen.swift
@@ -82,7 +82,8 @@ public final class ProductsScreen: ScreenObject {
     }
 
     public func selectProductType(productType: String) throws -> SingleProductScreen {
-        app.staticTexts[productType].tap()
+        let productTypeLabel = NSPredicate(format: "label CONTAINS[c] %@", productType)
+        app.staticTexts.containing(productTypeLabel).firstMatch.tap()
         return try SingleProductScreen()
     }
 }
diff --git a/WooCommerce/UITestsFoundation/Screens/Products/SingleProductScreen.swift b/WooCommerce/UITestsFoundation/Screens/Products/SingleProductScreen.swift
@@ -46,4 +46,29 @@ public final class SingleProductScreen: ScreenObject {
         XCTAssertTrue(app.staticTexts["TIP"].exists)
         XCTAssertTrue(app.textViews[productName].exists)
     }
+
+    public func verifyProductTypeScreenLoaded(productType: String) throws -> Self {
+        let addPriceLabel = NSPredicate(format: "label == 'Add Price'")
+        let inventoryLabel = NSPredicate(format: "label == 'Inventory'")
+        let productTypeLabel = NSPredicate(format: "label ==[c] '\(productType)'")
+        let addVariationLabel = NSPredicate(format: "label == 'Add variations'")
+
+        // the common fields on add product screen
+        XCTAssertTrue(app.cells["product-review-cell"].exists)
+        XCTAssertTrue(app.staticTexts.containing(productTypeLabel).firstMatch.exists)
+
+        // different product types displays different fields on add product screen
+        // this is to validate that the correct screens are displayed
+        switch productType {
+        case "physical", "virtual":
+            XCTAssertTrue(app.staticTexts.containing(addPriceLabel).firstMatch.exists)
+            XCTAssertTrue(app.staticTexts.containing(inventoryLabel).firstMatch.exists)
+        case "variable":
+            XCTAssertTrue(app.staticTexts.containing(addVariationLabel).firstMatch.exists)
+            XCTAssertTrue(app.staticTexts.containing(inventoryLabel).firstMatch.exists)
+        default:
+            fatalError("Product Type \(productType) doesn't exist!")
+        }
+        return self
+    }
 }
diff --git a/WooCommerce/WooCommerce.xcodeproj/project.pbxproj b/WooCommerce/WooCommerce.xcodeproj/project.pbxproj
@@ -1135,6 +1135,7 @@
 		7E7C5F872719A93C00315B61 /* ProductCategoryListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E7C5F812719A93C00315B61 /* ProductCategoryListViewController.swift */; };
 		7E7C5F8B2719AEDA00315B61 /* EditProductCategoryListViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E7C5F8A2719AEDA00315B61 /* EditProductCategoryListViewModelTests.swift */; };
 		7E7C5F8F2719BA7300315B61 /* ProductCategoryCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E7C5F8E2719BA7300315B61 /* ProductCategoryCellViewModel.swift */; };
+		80089F182949B92D0078C671 /* ProductFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80089F172949B92D0078C671 /* ProductFlow.swift */; };
 		800A5B58275483D6009DE2CD /* OrdersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 800A5B57275483D6009DE2CD /* OrdersTests.swift */; };
 		800A5B5F27548F31009DE2CD /* site_info_wordpress_com.json in Resources */ = {isa = PBXBuildFile; fileRef = 800A5B5E27548F31009DE2CD /* site_info_wordpress_com.json */; };
 		800A5B6127548F53009DE2CD /* sites_posts_password.json in Resources */ = {isa = PBXBuildFile; fileRef = 800A5B6027548F53009DE2CD /* sites_posts_password.json */; };
@@ -3149,6 +3150,7 @@
 		7E7C5F812719A93C00315B61 /* ProductCategoryListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductCategoryListViewController.swift; sourceTree = "<group>"; };
 		7E7C5F8A2719AEDA00315B61 /* EditProductCategoryListViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditProductCategoryListViewModelTests.swift; sourceTree = "<group>"; };
 		7E7C5F8E2719BA7300315B61 /* ProductCategoryCellViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductCategoryCellViewModel.swift; sourceTree = "<group>"; };
+		80089F172949B92D0078C671 /* ProductFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductFlow.swift; sourceTree = "<group>"; };
 		800A5B57275483D6009DE2CD /* OrdersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrdersTests.swift; sourceTree = "<group>"; };
 		800A5B5E27548F31009DE2CD /* site_info_wordpress_com.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = site_info_wordpress_com.json; sourceTree = "<group>"; };
 		800A5B6027548F53009DE2CD /* sites_posts_password.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = sites_posts_password.json; sourceTree = "<group>"; };
@@ -6823,6 +6825,7 @@
 			children = (
 				80E6FC742763579D0086CD67 /* MockDataReader.swift */,
 				800A5B9D275623FC009DE2CD /* LoginFlow.swift */,
+				80089F172949B92D0078C671 /* ProductFlow.swift */,
 			);
 			path = Flows;
 			sourceTree = "<group>";
@@ -11574,6 +11577,7 @@
 				80C3626F277453E8005CEAD3 /* ReviewsTests.swift in Sources */,
 				80E6FC79276C3FD60086CD67 /* MockDataReader.swift in Sources */,
 				CCDC49CD23FFFFF4003166BA /* LoginTests.swift in Sources */,
+				80089F182949B92D0078C671 /* ProductFlow.swift in Sources */,
 				800A5B58275483D6009DE2CD /* OrdersTests.swift in Sources */,
 				80AD2CA427858BAB00A63DE8 /* StatsTests.swift in Sources */,
 				800A5BCB2759CE4B009DE2CD /* ProductsTests.swift in Sources */,
diff --git a/WooCommerce/WooCommerceUITests/Flows/ProductFlow.swift b/WooCommerce/WooCommerceUITests/Flows/ProductFlow.swift
@@ -0,0 +1,17 @@
+import UITestsFoundation
+import XCTest
+
+class ProductFlow {
+
+    static func addAndVerifyNewProduct(productType: String) throws {
+        let product = try GetMocks.readNewProductData()
+
+        try TabNavComponent().goToProductsScreen()
+            .tapAddProduct()
+            .selectProductType(productType: productType)
+            .verifyProductTypeScreenLoaded(productType: productType)
+            .addProductTitle(productTitle: product.name)
+            .publishProduct()
+            .verifyNewProductScreenLoaded(productName: product.name)
+    }
+}
diff --git a/WooCommerce/WooCommerceUITests/README.md b/WooCommerce/WooCommerceUITests/README.md
@@ -44,8 +44,8 @@ The following flows are covered/planned to be covered by UI tests. Tests that ar
 4. Products
     - [x] Products list and single product screens load
     - [x] Add new product - Simple physical product
-    - [ ] Add new product - Simple virtual product
-    - [ ] Add new product - Variable product
+    - [x] Add new product - Simple virtual product
+    - [x] Add new product - Variable product
     - [ ] Add new product - Grouped product
     - [ ] Add new product - External product
     - [ ] Search for product
diff --git a/WooCommerce/WooCommerceUITests/Tests/ProductsTests.swift b/WooCommerce/WooCommerceUITests/Tests/ProductsTests.swift
@@ -3,14 +3,6 @@ import XCTest
 
 final class ProductsTests: XCTestCase {
 
-    let productTypes = [
-        "physical": "Simple physical product",
-        "virtual": "Simple virtual product",
-        "variable": "Variable product",
-        "grouped": "Grouped product",
-        "external": "External product"
-    ]
-
     override func setUpWithError() throws {
         continueAfterFailure = false
 
@@ -33,13 +25,14 @@ final class ProductsTests: XCTestCase {
     }
 
     func test_add_simple_physical_product() throws {
-        let product = try GetMocks.readNewProductData()
+        try ProductFlow.addAndVerifyNewProduct(productType: "physical")
+    }
 
-        try TabNavComponent().goToProductsScreen()
-            .tapAddProduct()
-            .selectProductType(productType: productTypes["physical"]!)
-            .addProductTitle(productTitle: product.name)
-            .publishProduct()
-            .verifyNewProductScreenLoaded(productName: product.name)
+    func test_add_simple_virtual_product() throws {
+        try ProductFlow.addAndVerifyNewProduct(productType: "virtual")
+    }
+
+    func test_add_variable_product() throws {
+        try ProductFlow.addAndVerifyNewProduct(productType: "variable")
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -271,6 +271,7 @@ private extension ProductFormTableViewDataSource {`
`271`	`271`	`ratingCount: ratingCount,`
`272`	`272`	`averageRating: averageRating)`
`273`	`273`	`cell.accessoryType = .disclosureIndicator`
	`274`	`+ cell.accessibilityIdentifier = "product-review-cell"`
`274`	`275`	`}`
`275`	`276`
`276`	`277`	`func configureSettingsRowWithASwitch(cell: UITableViewCell, viewModel: ProductFormSection.SettingsRow.SwitchableViewModel) {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,8 @@ public final class ProductsScreen: ScreenObject {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`public func selectProductType(productType: String) throws -> SingleProductScreen {`
`85`		`- app.staticTexts[productType].tap()`
	`85`	`+ let productTypeLabel = NSPredicate(format: "label CONTAINS[c] %@", productType)`
	`86`	`+ app.staticTexts.containing(productTypeLabel).firstMatch.tap()`
`86`	`87`	`return try SingleProductScreen()`
`87`	`88`	`}`
`88`	`89`	`}`