Skip to content

Commit 3f0049b

Browse files
VeronikaYaratsVeronikaYarats
committed
Merge remote-tracking branch 'remotes/github/MC-17387' into EPAM-PR-64
2 parents d3937e0 + 6d5f4d6 commit 3f0049b

File tree

2 files changed

+103
-4
lines changed

2 files changed

+103
-4
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminAddBundleProductToCartFromWishListPageTest.xml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminAddBundleProductToCartFromWishListPageTest">
11+
<annotations>
12+
<features value="Catalog"/>
13+
<title value="Add bundle product to Cart from Wish list page"/>
14+
<description value="Add bundle product to Cart from Wish list page"/>
15+
<severity value="MAJOR"/>
16+
<testCaseId value="MC-17782"/>
17+
<useCaseId value="MC-17387"/>
18+
<group value="catalog"/>
19+
</annotations>
20+
<before>
21+
<!-- Login as Admin -->
22+
<comment userInput="Login as Admin" stepKey="commentLoginAsAdmin"/>
23+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
24+
<!-- Create customer on Storefront and bundle product -->
25+
<comment userInput="Create customer on Storefront and bundle product" stepKey="commentCreateData"/>
26+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
27+
<createData entity="CustomerEntityOne" stepKey="createCustomerViaTheStorefront"/>
28+
<createData entity="_defaultProduct" stepKey="createSimpleProduct1">
29+
<requiredEntity createDataKey="createCategory"/>
30+
</createData>
31+
<createData entity="_defaultProduct" stepKey="createSimpleProduct2">
32+
<requiredEntity createDataKey="createCategory"/>
33+
</createData>
34+
<createData entity="ApiBundleProductPriceViewRange" stepKey="createProduct">
35+
<requiredEntity createDataKey="createCategory"/>
36+
</createData>
37+
<!-- Create Attribute -->
38+
<comment userInput="Create Attribute" stepKey="commentCreateAttribute"/>
39+
<createData entity="DropDownBundleOption" stepKey="bundleOption">
40+
<requiredEntity createDataKey="createProduct"/>
41+
</createData>
42+
<createData entity="ApiBundleLink" stepKey="createBundleLink1">
43+
<requiredEntity createDataKey="createProduct"/>
44+
<requiredEntity createDataKey="bundleOption"/>
45+
<requiredEntity createDataKey="createSimpleProduct1"/>
46+
</createData>
47+
<createData entity="ApiBundleLink" stepKey="createBundleLink2">
48+
<requiredEntity createDataKey="createProduct"/>
49+
<requiredEntity createDataKey="bundleOption"/>
50+
<requiredEntity createDataKey="createSimpleProduct2"/>
51+
</createData>
52+
<amOnPage url="{{AdminProductEditPage.url($$createProduct.id$$)}}" stepKey="goToProductEditPage"/>
53+
<actionGroup ref="saveProductForm" stepKey="saveProduct"/>
54+
</before>
55+
<after>
56+
<!-- Delete created data -->
57+
<comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
58+
<deleteData createDataKey="createCustomerViaTheStorefront" stepKey="deleteCustomerViaTheStorefront"/>
59+
<deleteData createDataKey="createProduct" stepKey="deleteProduct" />
60+
<!-- Log out -->
61+
<comment userInput="Log out" stepKey="commentLogOut"/>
62+
<actionGroup ref="logout" stepKey="logout"/>
63+
</after>
64+
<!-- Login to the Storefront as created customer -->
65+
<comment userInput="Login to the Storefront as created customer" stepKey="commentLoginAsCustomer"/>
66+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
67+
<argument name="Customer" value="$$createCustomerViaTheStorefront$$"/>
68+
</actionGroup>
69+
<!-- Add product to Wish List -->
70+
<comment userInput="Add product to Wish List" stepKey="commentAddProductToWishList"/>
71+
<amOnPage url="{{StorefrontProductPage.url($$createProduct.custom_attributes[url_key]$$)}}" stepKey="amOnBundleProductPage"/>
72+
<waitForPageLoad stepKey="waitForProductPage"/>
73+
<actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addToWishlistProduct">
74+
<argument name="productVar" value="$$createProduct$$"/>
75+
</actionGroup>
76+
<moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName($$createProduct.name$$)}}" stepKey="moveMouseOverProduct" />
77+
<click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName($$createProduct.name$$)}}" stepKey="clickAddToCart" />
78+
<waitForPageLoad stepKey="waitForProductBundlePage"/>
79+
<!-- See error message -->
80+
<comment userInput="See error message" stepKey="commentSeeErrorMessage"/>
81+
<see userInput=" Please specify product option(s)." stepKey="seeErrorMessage"/>
82+
</test>
83+
</tests>

‎app/code/Magento/Wishlist/view/frontend/layout/wishlist_index_configure_type_bundle.xml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
<block class="Magento\Wishlist\Block\Item\Configure" name="view.addto.wishlist.bundle"
2424
template="Magento_Wishlist::item/configure/addto/wishlist.phtml" />
2525
<block class="Magento\Catalog\Block\Product\View\AddTo\Compare" name="view.addto.compare.bundle" after="view.addto.wishlist"
26-
template="Magento_Catalog::product/view/addto/compare.phtml" />
26+
template="Magento_Catalog::product/view/addto/compare.phtml">
27+
<arguments>
28+
<argument name="addToCompareViewModel" xsi:type="object">Magento\Catalog\ViewModel\Product\Checker\AddToCompareAvailability</argument>
29+
</arguments>
30+
</block>
2731
</block>
2832
</block>
2933
</referenceBlock>
@@ -33,10 +37,22 @@
3337
<container name="product.info.bundle.options.top" as="product_info_bundle_options_top">
3438
<block class="Magento\Catalog\Block\Product\View" name="bundle.back.button" as="backButton" before="-" template="Magento_Bundle::catalog/product/view/backbutton.phtml"/>
3539
</container>
36-
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select"/>
40+
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Select" name="product.info.bundle.options.select" as="select">
41+
<arguments>
42+
<argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
43+
</arguments>
44+
</block>
3745
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Multi" name="product.info.bundle.options.multi" as="multi"/>
38-
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio"/>
39-
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox"/>
46+
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Radio" name="product.info.bundle.options.radio" as="radio">
47+
<arguments>
48+
<argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
49+
</arguments>
50+
</block>
51+
<block class="Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option\Checkbox" name="product.info.bundle.options.checkbox" as="checkbox">
52+
<arguments>
53+
<argument name="tier_price_renderer" xsi:type="object">\Magento\Bundle\Block\DataProviders\OptionPriceRenderer</argument>
54+
</arguments>
55+
</block>
4056
</block>
4157
</referenceBlock>
4258
<move element="product.price.tier" destination="product.info.options.wrapper.bottom" before="-" />

0 commit comments

Comments
 (0)