Skip to content

Commit 46bfa6a

Browse files
tomreecetomreece
committed
MQE-1878: Stabilize community PR 742
1 parent 762adea commit 46bfa6a

5 files changed

+86
-48
lines changed

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,47 @@
135135
<dontSeeElement selector="{{StorefrontCustomerWishlistProductSection.pager}}" stepKey="checkThatPagerIsAbsent"/>
136136
<see selector="{{StorefrontCustomerWishlistProductSection.wishlistEmpty}}" userInput="You have no items in your wish list." stepKey="checkNoItemsMessage"/>
137137
</actionGroup>
138+
139+
<actionGroup name="AssertMoveProductToWishListSuccessMessage">
140+
<annotations>
141+
<description>Moves a product from the cart to the wishlist.</description>
142+
</annotations>
143+
<arguments>
144+
<argument name="productName" type="string"/>
145+
</arguments>
146+
<click selector="{{CheckoutCartProductSection.moveToWishlistByProductName(productName)}}" stepKey="moveToWishlist"/>
147+
<waitForPageLoad stepKey="waitForMove"/>
148+
<see userInput="{{productName}} has been moved to your wish list." selector="{{CheckoutCartMessageSection.successMessage}}" stepKey="assertSuccess"/>
149+
</actionGroup>
150+
151+
<actionGroup name="AssertProductIsPresentInWishList">
152+
<annotations>
153+
<description>Go to storefront customer wishlist page and assert product name and price is present.</description>
154+
</annotations>
155+
<arguments>
156+
<argument name="productName" type="string"/>
157+
<argument name="productPrice" type="string"/>
158+
</arguments>
159+
<amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="goToWishList"/>
160+
<waitForPageLoad stepKey="waitForWishList"/>
161+
<waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName(productName)}}" time="30" stepKey="assertProductName"/>
162+
<see userInput="{{productPrice}}" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName(productName)}}" stepKey="assertProductPrice"/>
163+
</actionGroup>
164+
165+
<actionGroup name="AssertProductDetailsInWishlist">
166+
<annotations>
167+
<description>Assert product name and price in wishlist on hover.</description>
168+
</annotations>
169+
<arguments>
170+
<argument name="productName" type="string"/>
171+
<argument name="label" type="string"/>
172+
<argument name="labelValue" type="string"/>
173+
</arguments>
174+
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName(productName)}}" stepKey="moveMouseOverProductInfo"/>
175+
<seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName(productName)}}" stepKey="seeAddToCart"/>
176+
<seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName(productName)}}" stepKey="seeImage"/>
177+
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsByName(productName)}}" stepKey="moveMouseOverProductDetails"/>
178+
<see userInput="{{label}}" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsLabelByName(productName)}}" stepKey="seeLabel"/>
179+
<see userInput="{{labelValue}}" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsValueByName(productName)}}" stepKey="seeLabelValue"/>
180+
</actionGroup>
138181
</actionGroups>

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,23 +141,22 @@
141141
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
142142

143143
<!-- Assert move product to wishlist success message -->
144-
<click selector="{{CheckoutCartProductSection.moveToWishlistByProductName($$createConfigProduct.name$$)}}" stepKey="moveToWishlist"/>
145-
<waitForPageLoad stepKey="waitForPageLoad"/>
146-
<see userInput="$$createConfigProduct.name$$ has been moved to your wish list." selector="{{CheckoutCartMessageSection.successMessage}}" stepKey="assertMoveProductToWishlistSuccessMessage"/>
144+
<actionGroup ref="AssertMoveProductToWishListSuccessMessage" stepKey="moveToWishlist">
145+
<argument name="productName" value="$$createConfigProduct.name$$"/>
146+
</actionGroup>
147147

148148
<!-- Assert product is present in wishlist -->
149-
<amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="goToWishlistPage"/>
150-
<waitForPageLoad stepKey="waitForWishlistPage"/>
151-
<waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName($$createConfigProduct.name$$)}}" time="30" stepKey="assertWishlistProductName"/>
152-
<see userInput="$20.00" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName($$createConfigProduct.name$$)}}" stepKey="AssertWishlistProductPrice"/>
149+
<actionGroup ref="AssertProductIsPresentInWishList" stepKey="assertProductPresent">
150+
<argument name="productName" value="$$createConfigProduct.name$$"/>
151+
<argument name="productPrice" value="$20.00"/>
152+
</actionGroup>
153153

154154
<!-- Assert product details in Wishlist -->
155-
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createConfigProduct.name$$)}}" stepKey="wishlistMoveMouseOverProduct"/>
156-
<seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName($$createConfigProduct.name$$)}}" stepKey="AssertWishlistAddToCart"/>
157-
<seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName($$createConfigProduct.name$$)}}" stepKey="AssertWishlistProductImage"/>
158-
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsByName($$createConfigProduct.name$$)}}" stepKey="seeDetailsMoveMouseOverProduct"/>
159-
<see userInput="$$createConfigProductAttribute.default_value$$" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsLabelByName($$createConfigProduct.name$$)}}" stepKey="seeAttribute"/>
160-
<see userInput="$$getConfigAttributeOption2.label$$" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsValueByName($$createConfigProduct.name$$)}}" stepKey="seeOption"/>
155+
<actionGroup ref="AssertProductDetailsInWishlist" stepKey="assertProductDetails">
156+
<argument name="productName" value="$$createConfigProduct.name$$"/>
157+
<argument name="label" value="$$createConfigProductAttribute.default_value$$"/>
158+
<argument name="labelValue" value="$$getConfigAttributeOption2.label$$"/>
159+
</actionGroup>
161160

162161
<actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
163162
</test>

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,22 @@
8787
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
8888

8989
<!-- Assert move product to wishlist success message -->
90-
<click selector="{{CheckoutCartProductSection.moveToWishlistByProductName($$createBundleProduct.name$$)}}" stepKey="moveToWishlist"/>
91-
<waitForPageLoad stepKey="waitForPageLoad"/>
92-
<see userInput="$$createBundleProduct.name$$ has been moved to your wish list." selector="{{CheckoutCartMessageSection.successMessage}}" stepKey="assertMoveProductToWishlistSuccessMessage"/>
90+
<actionGroup ref="AssertMoveProductToWishListSuccessMessage" stepKey="moveToWishlist">
91+
<argument name="productName" value="$$createBundleProduct.name$$"/>
92+
</actionGroup>
9393

9494
<!-- Assert product is present in wishlist -->
95-
<amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="goToWishlistPage"/>
96-
<waitForPageLoad stepKey="waitForWishlistPage"/>
97-
<waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName($$createBundleProduct.name$$)}}" time="30" stepKey="assertWishlistProductName"/>
98-
<see userInput="$100.00" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName($$createBundleProduct.name$$)}}" stepKey="AssertWishlistProductPrice"/>
95+
<actionGroup ref="AssertProductIsPresentInWishList" stepKey="assertProductPresent">
96+
<argument name="productName" value="$$createBundleProduct.name$$"/>
97+
<argument name="productPrice" value="$100.00"/>
98+
</actionGroup>
9999

100100
<!-- Assert product details in Wishlist -->
101-
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createBundleProduct.name$$)}}" stepKey="wishlistMoveMouseOverProduct"/>
102-
<seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName($$createBundleProduct.name$$)}}" stepKey="AssertWishlistAddToCart"/>
103-
<seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName($$createBundleProduct.name$$)}}" stepKey="AssertWishlistProductImage"/>
104-
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsByName($$createBundleProduct.name$$)}}" stepKey="seeDetailsMoveMouseOverProduct"/>
105-
<see userInput="$$createBundleOption1_1.title$$" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsLabelByName($$createBundleProduct.name$$)}}" stepKey="seeBundleOption"/>
106-
<see userInput="$$simpleProduct1.sku$$ $100.00" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsValueByName($$createBundleProduct.name$$)}}" stepKey="seeProduct"/>
101+
<actionGroup ref="AssertProductDetailsInWishlist" stepKey="assertProductDetails">
102+
<argument name="productName" value="$$createBundleProduct.name$$"/>
103+
<argument name="label" value="$$createBundleOption1_1.title$$"/>
104+
<argument name="labelValue" value="$$simpleProduct1.sku$$ $100.00"/>
105+
</actionGroup>
107106

108107
<actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
109108
</test>

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,23 +78,22 @@
7878
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
7979

8080
<!-- Assert move product to wishlist success message -->
81-
<click selector="{{CheckoutCartProductSection.moveToWishlistByProductName($$createBundleProduct.name$$)}}" stepKey="moveToWishlist"/>
82-
<waitForPageLoad stepKey="waitForPageLoad"/>
83-
<see userInput="$$createBundleProduct.name$$ has been moved to your wish list." selector="{{CheckoutCartMessageSection.successMessage}}" stepKey="assertMoveProductToWishlistSuccessMessage"/>
81+
<actionGroup ref="AssertMoveProductToWishListSuccessMessage" stepKey="moveToWishlist">
82+
<argument name="productName" value="$$createBundleProduct.name$$"/>
83+
</actionGroup>
8484

8585
<!-- Assert product is present in wishlist -->
86-
<amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="goToWishlistPage"/>
87-
<waitForPageLoad stepKey="waitForWishlistPage"/>
88-
<waitForElement selector="{{StorefrontCustomerWishlistProductSection.ProductTitleByName($$createBundleProduct.name$$)}}" time="30" stepKey="assertWishlistProductName"/>
89-
<see userInput="$101.23" selector="{{StorefrontCustomerWishlistProductSection.ProductPriceByName($$createBundleProduct.name$$)}}" stepKey="AssertWishlistProductPrice"/>
86+
<actionGroup ref="AssertProductIsPresentInWishList" stepKey="assertProductPresent">
87+
<argument name="productName" value="$$createBundleProduct.name$$"/>
88+
<argument name="productPrice" value="$101.23"/>
89+
</actionGroup>
9090

9191
<!-- Assert product details in Wishlist -->
92-
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.ProductInfoByName($$createBundleProduct.name$$)}}" stepKey="wishlistMoveMouseOverProduct"/>
93-
<seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductAddToCartByName($$createBundleProduct.name$$)}}" stepKey="AssertWishlistAddToCart"/>
94-
<seeElement selector="{{StorefrontCustomerWishlistProductSection.ProductImageByName($$createBundleProduct.name$$)}}" stepKey="AssertWishlistProductImage"/>
95-
<moveMouseOver selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsByName($$createBundleProduct.name$$)}}" stepKey="seeDetailsMoveMouseOverProduct"/>
96-
<see userInput="$$createBundleOption1_1.title$$" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsLabelByName($$createBundleProduct.name$$)}}" stepKey="seeBundleOption"/>
97-
<see userInput="$$simpleProduct1.sku$$ $100.00" selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsValueByName($$createBundleProduct.name$$)}}" stepKey="seeProduct"/>
92+
<actionGroup ref="AssertProductDetailsInWishlist" stepKey="assertProductDetails">
93+
<argument name="productName" value="$$createBundleProduct.name$$"/>
94+
<argument name="label" value="$$createBundleOption1_1.title$$"/>
95+
<argument name="labelValue" value="$$simpleProduct1.sku$$ $100.00"/>
96+
</actionGroup>
9897

9998
<actionGroup ref="AssertShoppingCartIsEmptyActionGroup" stepKey="assertCartIsEmpty"/>
10099
</test>

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,14 @@
5353
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="selectViewAndEditCart"/>
5454

5555
<!-- Assert move product to wishlist success message -->
56-
<click selector="{{CheckoutCartProductSection.moveToWishlistByProductName($$createProduct.name$$)}}" stepKey="moveToWishlist"/>
57-
<waitForPageLoad stepKey="waitForPageLoad"/>
58-
<see userInput="$$createProduct.name$$ has been moved to your wish list." selector="{{CheckoutCartMessageSection.successMessage}}" stepKey="assertMoveProductToWishlistSuccessMessage"/>
59-
60-
<!-- Assert product is present in wishlist -->
61-
<amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="goToWishlistPage"/>
62-
<waitForPageLoad stepKey="waitForWishlistPage"/>
56+
<actionGroup ref="AssertMoveProductToWishListSuccessMessage" stepKey="moveToWishlist">
57+
<argument name="productName" value="$$createProduct.name$$"/>
58+
</actionGroup>
6359

64-
<actionGroup ref="StorefrontCustomerCheckProductInWishlist" stepKey="assertProductIsPresentInWishlist">
65-
<argument name="productVar" value="$$createProduct$$"/>
60+
<!-- Assert product is present in wishlist -->
61+
<actionGroup ref="AssertProductIsPresentInWishList" stepKey="assertProductPresent">
62+
<argument name="productName" value="$$createProduct.name$$"/>
63+
<argument name="productPrice" value="$$createProduct.price$$"/>
6664
</actionGroup>
6765

6866
<!-- Assert cart is empty -->

0 commit comments

Comments
 (0)