From 8e57b3fc76c51434f40c8becab44070e93961e6b Mon Sep 17 00:00:00 2001 From: "vadim.malesh" Date: Mon, 18 May 2020 15:28:05 +0300 Subject: [PATCH 1/3] fix --- .../Pricing/Render/ConfiguredPriceBox.php | 20 ++---- ...ProductsWithCustomOptionToWishlistTest.xml | 66 +++++++++++++++++++ 2 files changed, 70 insertions(+), 16 deletions(-) create mode 100644 app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml diff --git a/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php index 91b2b6d2a0d7f..e3629c7b220ab 100644 --- a/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php +++ b/app/code/Magento/Catalog/Pricing/Render/ConfiguredPriceBox.php @@ -86,22 +86,8 @@ protected function _prepareLayout() } /** - * {@inheritdoc} - */ - public function getPriceType($priceCode) - { - $price = $this->saleableItem->getPriceInfo()->getPrice($priceCode); - $item = $this->getData('item'); - if ($price instanceof ConfiguredPriceInterface - && $item instanceof ItemInterface - ) { - $price->setItem($item); - } - - return $price; - } - - /** + * Returns configured price + * * @return PriceInterface */ public function getConfiguredPrice(): PriceInterface @@ -117,6 +103,8 @@ public function getConfiguredPrice(): PriceInterface } /** + * Returns configured regular price + * * @return PriceInterface */ public function getConfiguredRegularPrice(): PriceInterface diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml new file mode 100644 index 0000000000000..6a646f2f65d7b --- /dev/null +++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml @@ -0,0 +1,66 @@ + + + + + + + + + + <description value="Add product with custom radio button option to wishlist."/> + <group value="wishlist"/> + <severity value="MAJOR"/> + <testCaseId value="MC-34245"/> + </annotations> + <before> + <createData entity="SimpleSubCategory" stepKey="categoryFirst"/> + <createData entity="SimpleProduct" stepKey="simpleProduct"> + <requiredEntity createDataKey="categoryFirst"/> + </createData> + + <updateData entity="productWithOptionRadiobutton" createDataKey="simpleProduct" stepKey="updateProductWithOptions"> + <requiredEntity createDataKey="simpleProduct"/> + </updateData> + + <createData entity="Simple_US_Customer" stepKey="customer"/> + <magentoCLI command="indexer:reindex" stepKey="reindex"/> + <magentoCLI command="cache:flush" stepKey="flushCache"/> + </before> + <after> + <deleteData createDataKey="simpleProduct" stepKey="deletesimpleProduct"/> + <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/> + <magentoCLI command="indexer:reindex" stepKey="reindex"/> + <magentoCLI command="cache:flush" stepKey="flushCache"/> + <deleteData createDataKey="customer" stepKey="deleteCustomer"/> + </after> + + <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount"> + <argument name="Customer" value="$$customer$$"/> + </actionGroup> + + <amOnPage url="{{StorefrontCategoryPage.url($$categoryFirst.name$$)}}" stepKey="navigateToCategoryFirstPage"/> + <actionGroup ref="StorefrontCheckCategorySimpleProductActionGroup" stepKey="browseAssertCategoryProduct1"> + <argument name="product" value="$$simpleProduct$$"/> + </actionGroup> + + <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage"> + <argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$"/> + </actionGroup> + + <actionGroup ref="StorefrontProductPageSelectRadioButtonOptionValueActionGroup" stepKey="selectRadioButtonOption"> + <argument name="attributeLabel" value="{{ProductOptionRadiobuttonWithTwoFixedOptions.title}}"/> + <argument name="optionLabel" value="{{ProductOptionValueRadioButtons1.title}}"/> + </actionGroup> + + <click selector="{{StorefrontProductPageSection.addToWishlist}}" stepKey="addProductToWishlist"/> + <actionGroup ref="AssertProductIsPresentInWishListActionGroup" stepKey="assertProductPresent"> + <argument name="productName" value="$$simpleProduct.name$$"/> + <argument name="productPrice" value="$222.99"/> + </actionGroup> + </test> +</tests> From 67adbc2177cc72086096e984ca1214838554edc0 Mon Sep 17 00:00:00 2001 From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com> Date: Mon, 18 May 2020 22:06:55 +0300 Subject: [PATCH 2/3] improve mftf --- .../StorefrontAddProductsWithCustomOptionToWishlistTest.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml index 6a646f2f65d7b..5434062854628 100644 --- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml +++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml @@ -28,15 +28,13 @@ </updateData> <createData entity="Simple_US_Customer" stepKey="customer"/> - <magentoCLI command="indexer:reindex" stepKey="reindex"/> - <magentoCLI command="cache:flush" stepKey="flushCache"/> + <magentoCron groups="index" stepKey="runCronReindex"/> </before> <after> <deleteData createDataKey="simpleProduct" stepKey="deletesimpleProduct"/> <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/> - <magentoCLI command="indexer:reindex" stepKey="reindex"/> - <magentoCLI command="cache:flush" stepKey="flushCache"/> <deleteData createDataKey="customer" stepKey="deleteCustomer"/> + <magentoCron groups="index" stepKey="runCronReindex"/> </after> <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount"> From 1aca9be7c0176b46e8562d2d05058e2245c47def Mon Sep 17 00:00:00 2001 From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com> Date: Thu, 21 May 2020 17:03:14 +0300 Subject: [PATCH 3/3] mftf improve --- ...AddProductsWithCustomOptionToWishlistTest.xml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml index 5434062854628..a77c991d580cd 100644 --- a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml +++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontAddProductsWithCustomOptionToWishlistTest.xml @@ -18,34 +18,22 @@ <testCaseId value="MC-34245"/> </annotations> <before> - <createData entity="SimpleSubCategory" stepKey="categoryFirst"/> - <createData entity="SimpleProduct" stepKey="simpleProduct"> - <requiredEntity createDataKey="categoryFirst"/> - </createData> - + <createData entity="SimpleProduct2" stepKey="simpleProduct"/> <updateData entity="productWithOptionRadiobutton" createDataKey="simpleProduct" stepKey="updateProductWithOptions"> <requiredEntity createDataKey="simpleProduct"/> </updateData> <createData entity="Simple_US_Customer" stepKey="customer"/> - <magentoCron groups="index" stepKey="runCronReindex"/> </before> <after> - <deleteData createDataKey="simpleProduct" stepKey="deletesimpleProduct"/> - <deleteData createDataKey="categoryFirst" stepKey="deleteCategoryFirst"/> + <deleteData createDataKey="simpleProduct" stepKey="deleteSimpleProduct"/> <deleteData createDataKey="customer" stepKey="deleteCustomer"/> - <magentoCron groups="index" stepKey="runCronReindex"/> </after> <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount"> <argument name="Customer" value="$$customer$$"/> </actionGroup> - <amOnPage url="{{StorefrontCategoryPage.url($$categoryFirst.name$$)}}" stepKey="navigateToCategoryFirstPage"/> - <actionGroup ref="StorefrontCheckCategorySimpleProductActionGroup" stepKey="browseAssertCategoryProduct1"> - <argument name="product" value="$$simpleProduct$$"/> - </actionGroup> - <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage"> <argument name="productUrl" value="$$simpleProduct.custom_attributes[url_key]$$"/> </actionGroup>