Fix certain M1 settings aren't accessible if the data are empty when M2 feature switch is off #2303
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import Yosemite | ||
|
|
||
| /// Creates actions for product form bottom sheet. | ||
| struct ProductFormBottomSheetActionsFactory { | ||
| private let product: Product | ||
| private let isEditProductsRelease2Enabled: Bool | ||
| private let isEditProductsRelease3Enabled: Bool | ||
|
|
||
| init(product: Product, isEditProductsRelease2Enabled: Bool, isEditProductsRelease3Enabled: Bool) { | ||
| self.product = product | ||
| self.isEditProductsRelease2Enabled = isEditProductsRelease2Enabled | ||
| self.isEditProductsRelease3Enabled = isEditProductsRelease3Enabled | ||
| } | ||
|
|
||
| /// Retruns an array of actions that are visible in the product form bottom sheet. | ||
| func actions() -> [ProductFormBottomSheetAction] { | ||
| let shouldShowShippingSettingsRow = product.isShippingEnabled | ||
| let shouldShowCategoriesRow = isEditProductsRelease3Enabled | ||
| let shouldShowShortDescriptionRow = isEditProductsRelease2Enabled | ||
| let actions: [ProductFormBottomSheetAction?] = [ | ||
| .editInventorySettings, | ||
| shouldShowShippingSettingsRow ? .editShippingSettings: nil, | ||
| shouldShowCategoriesRow ? .editCategories: nil, | ||
| shouldShowShortDescriptionRow ? .editBriefDescription: nil | ||
| ] | ||
| return actions.compactMap({ $0 }).filter({ $0.isVisible(product: product) }) | ||
|
Contributor
There was a problem hiding this comment. I wonder if we should also encapsulate the I wonder if we've outgrown the current architecture (expected and normal) and we need to do a review at some point in the future.
Contributor
Author
There was a problem hiding this comment. yea I think it'd be nice if we can merge the logic for making the bottom sheet actions and settings rows since they are based on the same data (product editing categories), maybe having both created from the same factory (a different name like |
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| import XCTest | ||
| @testable import WooCommerce | ||
| @testable import Yosemite | ||
|
|
||
| final class ProductFormBottomSheetActionsFactoryTests: XCTestCase { | ||
|
|
||
| // M3 feature flag off & M2 feature flag off | ||
|
|
||
| func testDataHasNoEditProductsRelease2And3ActionsForAPhysicalProductWhenBothFeatureFlagsAreOff() { | ||
| let product = Fixtures.physicalProduct | ||
| let isEditProductsRelease2Enabled = false | ||
| let isEditProductsRelease3Enabled = false | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings, | ||
| .editShippingSettings | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| func testDataHasNoEditProductsRelease2And3AndShippingActionsForAVirtualProductWhenBothFeatureFlagsAreOff() { | ||
| let product = Fixtures.virtualProduct | ||
| let isEditProductsRelease2Enabled = false | ||
| let isEditProductsRelease3Enabled = false | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| func testDataHasNoEditProductsRelease2And3AndShippingActionsForADownloadableProductWhenBothFeatureFlagsAreOff() { | ||
| let product = Fixtures.downloadableProduct | ||
| let isEditProductsRelease2Enabled = false | ||
| let isEditProductsRelease3Enabled = false | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| // M3 feature flag off & M2 feature flag on | ||
|
|
||
| func testDataHasNoEditProductsRelease3ActionsForAPhysicalProductWhenM3FeatureFlagIsOff() { | ||
| let product = Fixtures.physicalProduct | ||
| let isEditProductsRelease2Enabled = true | ||
| let isEditProductsRelease3Enabled = false | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings, | ||
| .editShippingSettings, | ||
| .editBriefDescription | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| func testDataHasNoEditProductsRelease3AndShippingActionsForAVirtualProductWhenM3FeatureFlagIsOff() { | ||
| let product = Fixtures.virtualProduct | ||
| let isEditProductsRelease2Enabled = true | ||
| let isEditProductsRelease3Enabled = false | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings, | ||
| .editBriefDescription | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| func testDataHasNoEditProductsRelease3AndShippingActionsForADownloadableProductWhenM3FeatureFlagIsOff() { | ||
| let product = Fixtures.downloadableProduct | ||
| let isEditProductsRelease2Enabled = true | ||
| let isEditProductsRelease3Enabled = false | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings, | ||
| .editBriefDescription | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| // M3 feature flag on & M2 feature flag is on | ||
|
|
||
| func testDataHasEditProductsRelease3ActionsForAPhysicalProductWhenBothFeatureFlagsAreOn() { | ||
| let product = Fixtures.physicalProduct | ||
| let isEditProductsRelease2Enabled = true | ||
| let isEditProductsRelease3Enabled = true | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings, | ||
| .editShippingSettings, | ||
| .editCategories, | ||
| .editBriefDescription | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| func testDataHasEditProductsRelease3ButNoShippingActionsForAVirtualProductWhenBothFeatureFlagsAreOn() { | ||
| let product = Fixtures.virtualProduct | ||
| let isEditProductsRelease2Enabled = true | ||
| let isEditProductsRelease3Enabled = true | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings, | ||
| .editCategories, | ||
| .editBriefDescription | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| func testDataHasEditProductsRelease3ButNoShippingActionsForADownloadableProductWhenBothFeatureFlagsAreOn() { | ||
| let product = Fixtures.downloadableProduct | ||
| let isEditProductsRelease2Enabled = true | ||
| let isEditProductsRelease3Enabled = true | ||
| let actions = ProductFormBottomSheetActionsFactory(product: product, | ||
| isEditProductsRelease2Enabled: isEditProductsRelease2Enabled, | ||
| isEditProductsRelease3Enabled: isEditProductsRelease3Enabled).actions() | ||
|
|
||
| let expectedActions: [ProductFormBottomSheetAction] = [ | ||
| .editInventorySettings, | ||
| .editCategories, | ||
| .editBriefDescription | ||
| ] | ||
| XCTAssertEqual(actions, expectedActions) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private extension ProductFormBottomSheetActionsFactoryTests { | ||
| enum Fixtures { | ||
| // downloadable: false, virtual: false, missing inventory/shipping/categories/brief description | ||
| static let physicalProduct = MockProduct().product(downloadable: false, briefDescription: "", manageStock: true, sku: nil, stockQuantity: nil, | ||
| dimensions: ProductDimensions(length: "", width: "", height: ""), weight: nil, | ||
| virtual: false, | ||
| categories: []) | ||
| // downloadable: false, virtual: true, missing inventory/shipping/categories/brief description | ||
| static let virtualProduct = MockProduct().product(downloadable: false, briefDescription: "", manageStock: true, sku: nil, stockQuantity: nil, | ||
| dimensions: ProductDimensions(length: "", width: "", height: ""), weight: nil, | ||
| virtual: true, | ||
| categories: []) | ||
| // downloadable: true, virtual: true, missing inventory/shipping/categories/brief description | ||
| static let downloadableProduct = MockProduct().product(downloadable: true, briefDescription: "", manageStock: true, sku: nil, stockQuantity: nil, | ||
| dimensions: ProductDimensions(length: "", width: "", height: ""), weight: nil, | ||
| virtual: true, | ||
| categories: []) | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.