Skip to content

Commit 39e1e78

Browse files
MilaLesechkoMilaLesechko
committed
MC-4766: Convert FrontendOrderPagerTest to MFTF
1 parent bda3c27 commit 39e1e78

File tree

5 files changed

+47
-51
lines changed

5 files changed

+47
-51
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontAddProductToCartFromCategoryActionGroup.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="StorefrontAddProductToCartFromCategoryActionGroup">
1212
<arguments>
13-
<argument name="product" type="entity"/>
13+
<argument name="productName" type="string"/>
1414
</arguments>
15-
<scrollTo selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="scroll"/>
16-
<moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(product.name)}}" stepKey="moveMouseOverProduct" />
17-
<click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(product.name)}}" stepKey="clickAddToCart" />
15+
<scrollTo selector="{{StorefrontCategoryProductSection.ProductInfoByName(productName)}}" stepKey="scroll"/>
16+
<moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productName)}}" stepKey="moveMouseOverProduct" />
17+
<click selector="{{StorefrontCategoryProductSection.ProductAddToCartByName(productName)}}" stepKey="clickAddToCart" />
1818
<waitForAjaxLoad stepKey="waitForAjax"/>
1919
</actionGroup>
2020
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutOrderSummarySection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
<element name="billingAddress" type="textarea" selector="//*[@class='box box-address-billing']//address"/>
1919
<element name="additionalAddress" type="text" selector=".block.block-addresses-list"/>
2020
<element name="miniCartTabClosed" type="button" selector=".title[aria-expanded='false']" timeout="30"/>
21-
<element name="itemsQtyInCart" type="text" selector="span[data-bind='text: getCartLineItemsCount()']"/>
21+
<element name="itemsQtyInCart" type="text" selector=".items-in-cart > .title > strong > span"/>
2222
</section>
2323
</sections>

‎app/code/Magento/Sales/Test/Mftf/Section/StorefrontCustomerOrdersGridSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="StorefrontCustomerOrdersGridSection">
12-
<element name="orderView" type="button" selector="//td[text()='{{orderNumber}}']/following-sibling::td/a[@class='action view']" parameterized="true" />
12+
<element name="orderView" type="button" selector="//td[text()='{{orderNumber}}']/following-sibling::td[@class='col actions']/a[contains(@class, 'view')]" parameterized="true" />
1313
</section>
1414
</sections>

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,67 +134,67 @@
134134
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
135135

136136
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct1">
137-
<argument name="product" value="$$createProduct01$$"/>
137+
<argument name="productName" value="$$createProduct01.name$$"/>
138138
</actionGroup>
139139
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct2">
140-
<argument name="product" value="$$createProduct02$$"/>
140+
<argument name="productName" value="$$createProduct02.name$$"/>
141141
</actionGroup>
142142
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct3">
143-
<argument name="product" value="$$createProduct03$$"/>
143+
<argument name="productName" value="$$createProduct03.name$$"/>
144144
</actionGroup>
145145
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct4">
146-
<argument name="product" value="$$createProduct04$$"/>
146+
<argument name="productName" value="$$createProduct04.name$$"/>
147147
</actionGroup>
148148
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct5">
149-
<argument name="product" value="$$createProduct05$$"/>
149+
<argument name="productName" value="$$createProduct05.name$$"/>
150150
</actionGroup>
151151
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct6">
152-
<argument name="product" value="$$createProduct06$$"/>
152+
<argument name="productName" value="$$createProduct06.name$$"/>
153153
</actionGroup>
154154
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct7">
155-
<argument name="product" value="$$createProduct07$$"/>
155+
<argument name="productName" value="$$createProduct07.name$$"/>
156156
</actionGroup>
157157
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct8">
158-
<argument name="product" value="$$createProduct08$$"/>
158+
<argument name="productName" value="$$createProduct08.name$$"/>
159159
</actionGroup>
160160
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct9">
161-
<argument name="product" value="$$createProduct09$$"/>
161+
<argument name="productName" value="$$createProduct09.name$$"/>
162162
</actionGroup>
163163
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct10">
164-
<argument name="product" value="$$createProduct10$$"/>
164+
<argument name="productName" value="$$createProduct10.name$$"/>
165165
</actionGroup>
166166
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct11">
167-
<argument name="product" value="$$createProduct11$$"/>
167+
<argument name="productName" value="$$createProduct11.name$$"/>
168168
</actionGroup>
169169
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct12">
170-
<argument name="product" value="$$createProduct12$$"/>
170+
<argument name="productName" value="$$createProduct12.name$$"/>
171171
</actionGroup>
172172
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct13">
173-
<argument name="product" value="$$createProduct13$$"/>
173+
<argument name="productName" value="$$createProduct13.name$$"/>
174174
</actionGroup>
175175
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct14">
176-
<argument name="product" value="$$createProduct14$$"/>
176+
<argument name="productName" value="$$createProduct14.name$$"/>
177177
</actionGroup>
178178
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct15">
179-
<argument name="product" value="$$createProduct15$$"/>
179+
<argument name="productName" value="$$createProduct15.name$$"/>
180180
</actionGroup>
181181
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct16">
182-
<argument name="product" value="$$createProduct16$$"/>
182+
<argument name="productName" value="$$createProduct16.name$$"/>
183183
</actionGroup>
184184
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct17">
185-
<argument name="product" value="$$createProduct17$$"/>
185+
<argument name="productName" value="$$createProduct17.name$$"/>
186186
</actionGroup>
187187
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct18">
188-
<argument name="product" value="$$createProduct18$$"/>
188+
<argument name="productName" value="$$createProduct18.name$$"/>
189189
</actionGroup>
190190
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct19">
191-
<argument name="product" value="$$createProduct19$$"/>
191+
<argument name="productName" value="$$createProduct19.name$$"/>
192192
</actionGroup>
193193
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct20">
194-
<argument name="product" value="$$createProduct20$$"/>
194+
<argument name="productName" value="$$createProduct20.name$$"/>
195195
</actionGroup>
196196
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct21">
197-
<argument name="product" value="$$createProduct21$$"/>
197+
<argument name="productName" value="$$createProduct21.name$$"/>
198198
</actionGroup>
199199

200200
<!-- Place Order -->
@@ -203,15 +203,13 @@
203203
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
204204
<waitForLoadingMaskToDisappear stepKey="waitForCheckoutLoad"/>
205205
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="placeOrder"/>
206-
<waitForLoadingMaskToDisappear stepKey="waitForPlaceOrder"/>
207206
<waitForPageLoad stepKey="waitForSuccess"/>
208207
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
209208

210209
<!-- Go to My Account > My Orders page -->
211210
<amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onMyAccount"/>
212211
<waitForPageLoad stepKey="waitForAccountPage"/>
213212
<click selector="{{StorefrontCustomerSidebarSection.sidebarTab('My Orders')}}" stepKey="clickOnMyOrders"/>
214-
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
215213
<waitForPageLoad stepKey="waitForOrdersLoad"/>
216214

217215
<!-- Click 'View Order' link on order from preconditions -->

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,64 +130,64 @@
130130
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
131131

132132
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct1">
133-
<argument name="product" value="$$createProduct01$$"/>
133+
<argument name="productName" value="$$createProduct01.name$$"/>
134134
</actionGroup>
135135
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct2">
136-
<argument name="product" value="$$createProduct02$$"/>
136+
<argument name="productName" value="$$createProduct02.name$$"/>
137137
</actionGroup>
138138
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct3">
139-
<argument name="product" value="$$createProduct03$$"/>
139+
<argument name="productName" value="$$createProduct03.name$$"/>
140140
</actionGroup>
141141
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct4">
142-
<argument name="product" value="$$createProduct04$$"/>
142+
<argument name="productName" value="$$createProduct04.name$$"/>
143143
</actionGroup>
144144
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct5">
145-
<argument name="product" value="$$createProduct05$$"/>
145+
<argument name="productName" value="$$createProduct05.name$$"/>
146146
</actionGroup>
147147
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct6">
148-
<argument name="product" value="$$createProduct06$$"/>
148+
<argument name="productName" value="$$createProduct06.name$$"/>
149149
</actionGroup>
150150
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct7">
151-
<argument name="product" value="$$createProduct07$$"/>
151+
<argument name="productName" value="$$createProduct07.name$$"/>
152152
</actionGroup>
153153
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct8">
154-
<argument name="product" value="$$createProduct08$$"/>
154+
<argument name="productName" value="$$createProduct08.name$$"/>
155155
</actionGroup>
156156
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct9">
157-
<argument name="product" value="$$createProduct09$$"/>
157+
<argument name="productName" value="$$createProduct09.name$$"/>
158158
</actionGroup>
159159
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct10">
160-
<argument name="product" value="$$createProduct10$$"/>
160+
<argument name="productName" value="$$createProduct10.name$$"/>
161161
</actionGroup>
162162
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct11">
163-
<argument name="product" value="$$createProduct11$$"/>
163+
<argument name="productName" value="$$createProduct11.name$$"/>
164164
</actionGroup>
165165
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct12">
166-
<argument name="product" value="$$createProduct12$$"/>
166+
<argument name="productName" value="$$createProduct12.name$$"/>
167167
</actionGroup>
168168
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct13">
169-
<argument name="product" value="$$createProduct13$$"/>
169+
<argument name="productName" value="$$createProduct13.name$$"/>
170170
</actionGroup>
171171
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct14">
172-
<argument name="product" value="$$createProduct14$$"/>
172+
<argument name="productName" value="$$createProduct14.name$$"/>
173173
</actionGroup>
174174
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct15">
175-
<argument name="product" value="$$createProduct15$$"/>
175+
<argument name="productName" value="$$createProduct15.name$$"/>
176176
</actionGroup>
177177
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct16">
178-
<argument name="product" value="$$createProduct16$$"/>
178+
<argument name="productName" value="$$createProduct16.name$$"/>
179179
</actionGroup>
180180
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct17">
181-
<argument name="product" value="$$createProduct17$$"/>
181+
<argument name="productName" value="$$createProduct17.name$$"/>
182182
</actionGroup>
183183
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct18">
184-
<argument name="product" value="$$createProduct18$$"/>
184+
<argument name="productName" value="$$createProduct18.name$$"/>
185185
</actionGroup>
186186
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct19">
187-
<argument name="product" value="$$createProduct19$$"/>
187+
<argument name="productName" value="$$createProduct19.name$$"/>
188188
</actionGroup>
189189
<actionGroup ref="StorefrontAddProductToCartFromCategoryActionGroup" stepKey="addProduct20">
190-
<argument name="product" value="$$createProduct20$$"/>
190+
<argument name="productName" value="$$createProduct20.name$$"/>
191191
</actionGroup>
192192

193193
<!-- Place Order -->
@@ -196,15 +196,13 @@
196196
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNextButton"/>
197197
<waitForLoadingMaskToDisappear stepKey="waitForCheckoutLoad"/>
198198
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="placeOrder"/>
199-
<waitForLoadingMaskToDisappear stepKey="waitForPlaceOrder"/>
200199
<waitForPageLoad stepKey="waitForSuccess"/>
201200
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
202201

203202
<!-- Go to My Account > My Orders page -->
204203
<amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onMyAccount"/>
205204
<waitForPageLoad stepKey="waitForAccountPage"/>
206205
<click selector="{{StorefrontCustomerSidebarSection.sidebarTab('My Orders')}}" stepKey="clickOnMyOrders"/>
207-
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
208206
<waitForPageLoad stepKey="waitForOrdersLoad"/>
209207

210208
<!-- Click 'View Order' link on order from preconditions -->

0 commit comments

Comments
 (0)