Merge pull request #3866 from woocommerce/issue/3846-fix-missing-more-button-for-variations

Fix Unable to Delete Variations

Author: shiki

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

@@ -65,12 +65,20 @@ final class ProductVariationFormViewModel: ProductFormViewModelProtocol {
 
     /// The action buttons that should be rendered in the navigation bar.
     var actionButtons: [ActionButtonType] {
-        switch (formType, hasUnsavedChanges()) {
-        case (.edit, true):
-            return [.save]
-        default:
-            return []
+        var buttons: [ActionButtonType] = {
+            switch (formType, hasUnsavedChanges()) {
+            case (.edit, true):
+                return [.save]
+            default:
+                return []
+            }
+        }()
+
+        if shouldShowMoreOptionsMenu() {
+            buttons.append(.more)
         }
+
+        return buttons
     }
 
     /// Assign this closure to get notified when the variation is deleted.

WooCommerce/WooCommerceTests/ViewRelated/Products/Edit Product/ProductVariationFormViewModel+ChangesTests.swift

@@ -8,7 +8,7 @@ import Yosemite
 final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
     private let defaultSiteID: Int64 = 134
 
-    func testProductVariationHasNoChangesFromEditActionsOfTheSameData() {
+    func test_product_variation_has_no_changes_from_edit_actions_of_the_same_data() {
         // Arrange
         let productVariation = MockProductVariation().productVariation()
         let model = EditableProductVariationModel(productVariation: productVariation)
@@ -36,7 +36,7 @@ final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
         XCTAssertFalse(viewModel.hasUnsavedChanges())
     }
 
-    func testProductVariationHasUnsavedChangesFromUploadingAnImage() {
+    func test_product_variation_has_unsaved_changes_from_uploading_an_image() {
         // Arrange
         let productVariation = MockProductVariation().productVariation()
         let model = EditableProductVariationModel(productVariation: productVariation)
@@ -57,7 +57,7 @@ final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
         XCTAssertTrue(viewModel.hasUnsavedChanges())
     }
 
-    func testProductVariationHasUnsavedChangesFromEditingImages() {
+    func test_product_variation_has_unsaved_changes_from_editing_images() {
         // Arrange
         let productVariation = MockProductVariation().productVariation()
         let model = EditableProductVariationModel(productVariation: productVariation)
@@ -77,7 +77,7 @@ final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
         XCTAssertTrue(viewModel.hasUnsavedChanges())
     }
 
-    func testProductVariationHasUnsavedChangesFromEditingDescription() {
+    func test_product_variation_has_unsaved_changes_from_editing_description() {
         // Arrange
         let productVariation = MockProductVariation().productVariation()
         let model = EditableProductVariationModel(productVariation: productVariation)
@@ -91,7 +91,7 @@ final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
         XCTAssertTrue(viewModel.hasUnsavedChanges())
     }
 
-    func testProductVariationHasUnsavedChangesFromEditingPriceSettings() {
+    func test_product_variation_has_unsaved_changes_from_editing_price_settings() {
         // Arrange
         let productVariation = MockProductVariation().productVariation()
         let model = EditableProductVariationModel(productVariation: productVariation)
@@ -105,7 +105,7 @@ final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
         XCTAssertTrue(viewModel.hasUnsavedChanges())
     }
 
-    func testProductVariationHasUnsavedChangesFromEditingInventorySettings() {
+    func test_product_variation_has_unsaved_changes_from_editing_inventory_settings() {
         // Arrange
         let productVariation = MockProductVariation().productVariation()
         let model = EditableProductVariationModel(productVariation: productVariation)
@@ -119,7 +119,7 @@ final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
         XCTAssertTrue(viewModel.hasUnsavedChanges())
     }
 
-    func testProductVariationHasUnsavedChangesFromEditingShippingSettings() {
+    func test_product_variation_has_unsaved_changes_from_editing_shipping_settings() {
         // Arrange
         let productVariation = MockProductVariation().productVariation()
         let model = EditableProductVariationModel(productVariation: productVariation)
@@ -162,7 +162,7 @@ final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
         let actionButtons = viewModel.actionButtons
 
         // Then
-        XCTAssertEqual(actionButtons, [.save])
+        XCTAssertEqual(actionButtons, [.save, .more])
     }
 
     func test_action_buttons_for_existing_product_and_no_pending_changes() {
@@ -176,7 +176,7 @@ final class ProductVariationFormViewModel_ChangesTests: XCTestCase {
         let actionButtons = viewModel.actionButtons
 
         // Then
-        XCTAssertEqual(actionButtons, [])
+        XCTAssertEqual(actionButtons, [.more])
     }
 }