Skip to content

Commit f812312

Browse files
nikshostkonikshostko
committed
Merge remote-tracking branch 'github-magento/MAGETWO-91666' into EPAM-PR-6
2 parents 1a752a5 + 4b5b13e commit f812312

File tree

4 files changed

+81
-0
lines changed

4 files changed

+81
-0
lines changed

‎app/code/Magento/Wishlist/Controller/Index/Update.php

100644100755
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ public function execute()
111111
}
112112
try {
113113
$item->setDescription($description)->setQty($qty)->save();
114+
$this->messageManager->addSuccessMessage(
115+
__('%1 has been updated in your Wish List.', $item->getProduct()->getName())
116+
);
114117
$updatedItems++;
115118
} catch (\Exception $e) {
116119
$this->messageManager->addError(

‎app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,18 @@
7373
<waitForElement selector="{{StorefrontCategoryMainSection.SuccessMsg}}" time="30" stepKey="AddProductToCartFromWishlistUsingSidebarWaitForSuccessMessage"/>
7474
<see selector="{{StorefrontCategoryMainSection.SuccessMsg}}" userInput="You added {{product.name}} to your shopping cart." stepKey="AddProductToCartFromWishlistUsingSidebarSeeProductNameAddedToCartFromWishlist"/>
7575
</actionGroup>
76+
77+
<actionGroup name="StorefrontCustomerEditProductInWishlist">
78+
<arguments>
79+
<argument name="product"/>
80+
<argument name="description" type="string"/>
81+
<argument name="quantity" type="string"/>
82+
</arguments>
83+
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(product.name)}}" stepKey="mouseOverOnProduct"/>
84+
<fillField selector="{{StorefrontCustomerWishlistProductSection.ProductDescription(product.name)}}" userInput="{{description}}" stepKey="fillDescription"/>
85+
<fillField selector="{{StorefrontCustomerWishlistProductSection.ProductQuantity(product.name)}}" userInput="{{quantity}}" stepKey="fillQuantity"/>
86+
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductAddAllToCart}}" stepKey="mouseOver"/>
87+
<click selector="{{StorefrontCustomerWishlistProductSection.ProductUpdateWishList}}" stepKey="submitUpdateWishlist"/>
88+
<see selector="{{StorefrontCustomerWishlistProductSection.ProductSuccessUpdateMessage}}" userInput="{{product.name}} has been updated in your Wish List." stepKey="successMessage"/>
89+
</actionGroup>
7690
</actionGroups>

‎app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCustomerWishlistProductSection.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,10 @@
1515
<element name="ProductInfoByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//div[@class='product-item-info']" parameterized="true"/>
1616
<element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[contains(@class, 'action tocart primary')]" parameterized="true"/>
1717
<element name="ProductImageByImageName" type="text" selector="//main//li//a//img[contains(@src, '{{var1}}')]" parameterized="true"/>
18+
<element name="ProductDescription" type="input" selector="//a[contains(text(), '{{productName}}')]/ancestor::div[@class='product-item-info']//textarea[@class='product-item-comment']" parameterized="true"/>
19+
<element name="ProductQuantity" type="input" selector="//a[contains(text(), '{{productName}}')]/ancestor::div[@class='product-item-info']//input[@class='input-text qty']" parameterized="true"/>
20+
<element name="ProductUpdateWishList" type="button" selector=".column.main .actions-toolbar .action.update" timeout="30"/>
21+
<element name="ProductAddAllToCart" type="button" selector=".column.main .actions-toolbar .action.tocart" timeout="30"/>
22+
<element name="ProductSuccessUpdateMessage" type="text" selector="//div[1]/div[2]/div/div/div"/>
1823
</section>
1924
</sections>

‎app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontUpdateWishlistTest.xml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
10+
<test name="StorefrontUpdateWishlistTest">
11+
<annotations>
12+
<title value="Displaying of message after Wish List update"/>
13+
<stories value="MAGETWO-91666: Wishlist update does not return a success message"/>
14+
<description value="Displaying of message after Wish List update"/>
15+
<features value="Wishlist"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="MAGETWO-94296"/>
18+
<group value="Wishlist"/>
19+
</annotations>
20+
21+
<before>
22+
<createData entity="SimpleSubCategory" stepKey="category"/>
23+
<createData entity="SimpleProduct" stepKey="product">
24+
<requiredEntity createDataKey="category"/>
25+
</createData>
26+
<createData entity="Simple_US_Customer" stepKey="customer"/>
27+
</before>
28+
29+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
30+
<argument name="Customer" value="$$customer$$"/>
31+
</actionGroup>
32+
33+
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
34+
<argument name="category" value="$$category$$"/>
35+
<argument name="product" value="$$product$$"/>
36+
</actionGroup>
37+
38+
<actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductToWishlist">
39+
<argument name="productVar" value="$$product$$"/>
40+
</actionGroup>
41+
42+
<actionGroup ref="StorefrontCustomerCheckProductInWishlist" stepKey="checkProductInWishlist">
43+
<argument name="productVar" value="$$product$$"/>
44+
</actionGroup>
45+
46+
<actionGroup ref="StorefrontCustomerEditProductInWishlist" stepKey="updateProductInWishlist">
47+
<argument name="product" value="$$product$$"/>
48+
<argument name="description" value="some text"/>
49+
<argument name="quantity" value="2"/>
50+
</actionGroup>
51+
52+
<after>
53+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
54+
<deleteData createDataKey="product" stepKey="deleteProduct"/>
55+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
56+
</after>
57+
58+
</test>
59+
</tests>

0 commit comments

Comments
 (0)