Skip to content

Commit bc71c76

Browse files
committed
Merge branch 'B2B-2125' of https://github.com/magento-arcticfoxes/magento2ce into af-prs-develop
2 parents dd7d4a2 + f2ef946 commit bc71c76

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<element name="showCart" type="button" selector="a.showcart" timeout="60"/>
2323
<element name="quantity" type="button" selector="span.counter-number"/>
2424
<element name="miniCartOpened" type="button" selector="a.showcart.active"/>
25-
<element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="30"/>
25+
<element name="goToCheckout" type="button" selector="#top-cart-btn-checkout" timeout="60"/>
2626
<element name="viewAndEditCart" type="button" selector=".action.viewcart" timeout="30"/>
2727
<element name="miniCartItemsText" type="text" selector=".minicart-items"/>
2828
<element name="editMiniCartItem" type="button" selector=".action.edit" timeout="30"/>

app/code/Magento/Translation/Test/Mftf/Test/StorefrontInlineTranslationOnCheckoutTest.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@
206206

207207
<!-- 6. Go through checkout process and try to translate all labels that have red border with 'book' icon. Like you did it in step #4. -->
208208
<!-- Check Progress Bar Shipping -->
209+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.progressBarActive}}" stepKey="waitForProgressBarShipping"/>
209210
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertProgressBarShipping">
210211
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.progressBarActive}}"/>
211212
</actionGroup>
@@ -221,6 +222,7 @@
221222
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateProgressBarShipping3"/>
222223

223224
<!-- Check step title "Shipping Address" -->
225+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.stepTitleShipping}}" stepKey="waitForShippingAddressTitle"/>
224226
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertShippingAddressTitle">
225227
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.stepTitleShipping}}"/>
226228
</actionGroup>
@@ -236,6 +238,7 @@
236238
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateShippingAddressTitle3"/>
237239

238240
<!-- Check button "Ship Here" -->
241+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.buttonShippingHere}}" stepKey="waitForButtonShipHere"/>
239242
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertButtonShipHere">
240243
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.buttonShippingHere}}"/>
241244
</actionGroup>
@@ -251,6 +254,7 @@
251254
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateButtonShipHere3"/>
252255

253256
<!-- Check button "+ New Address" -->
257+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.buttonNewAddress}}" stepKey="waitForButtonNewAddress"/>
254258
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertButtonNewAddress">
255259
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.buttonNewAddress}}"/>
256260
</actionGroup>
@@ -266,6 +270,7 @@
266270
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateButtonNewAddress3"/>
267271

268272
<!-- Check title "Shipping Method" -->
273+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.titleShippingMethod}}" stepKey="waitForTitleShippingMethod"/>
269274
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertTitleShippingMethod">
270275
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.titleShippingMethod}}"/>
271276
</actionGroup>
@@ -281,6 +286,7 @@
281286
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateTitleShippingMethod3"/>
282287

283288
<!-- Check button "Next" -->
289+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.buttonNext}}" stepKey="waitForButtonNext"/>
284290
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertButtonNext">
285291
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.buttonNext}}"/>
286292
</actionGroup>
@@ -296,6 +302,7 @@
296302
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateButtonNext3"/>
297303

298304
<!-- Check title "Order Summary" -->
305+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.titleOrderSummary}}" stepKey="waitForTitleOrderSummary"/>
299306
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertTitleOrderSummary">
300307
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.titleOrderSummary}}"/>
301308
</actionGroup>
@@ -311,6 +318,7 @@
311318
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateTitleOrderSummary3"/>
312319

313320
<!-- Check text "Item in Cart"-->
321+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.itemsInCartText}}" stepKey="waitForItemsInCartText"/>
314322
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertItemsInCartText">
315323
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.itemsInCartText}}"/>
316324
</actionGroup>
@@ -330,6 +338,7 @@
330338
<actionGroup ref="StorefrontCheckoutForwardFromShippingStepActionGroup" stepKey="gotoPaymentStepBeforeTranslate"/>
331339

332340
<!-- Check Progress Bar Review & Payments -->
341+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.progressBarActive}}" stepKey="waitForProgressBarReviewAndPayments"/>
333342
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertProgressBarReviewAndPayments">
334343
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.progressBarActive}}"/>
335344
</actionGroup>
@@ -345,6 +354,7 @@
345354
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateProgressBarReviewAndPayments3"/>
346355

347356
<!-- Check title "Payment Method" -->
357+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.titlePayment}}" stepKey="waitForTitlePayment"/>
348358
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertTitlePayment">
349359
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.titlePayment}}"/>
350360
</actionGroup>
@@ -360,6 +370,7 @@
360370
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateTitlePayment3"/>
361371

362372
<!-- Check text for checkbox "My billing and shipping address are the same" -->
373+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.checkboxSameBillingAddress}}" stepKey="waitForCheckboxSameBillingAddress"/>
363374
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertCheckboxSameBillingAddress">
364375
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.checkboxSameBillingAddress}}"/>
365376
</actionGroup>
@@ -375,6 +386,7 @@
375386
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateCheckboxSameBillingAddress3"/>
376387

377388
<!-- Check button "Place Order" -->
389+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.buttonPlaceOrder}}" stepKey="waitForButtonPlaceOrder"/>
378390
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertButtonPlaceOrder">
379391
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.buttonPlaceOrder}}"/>
380392
</actionGroup>
@@ -390,6 +402,7 @@
390402
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateButtonPlaceOrder3"/>
391403

392404
<!-- Check button "Apply Discount Code" -->
405+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.textApplyDiscountCode}}" stepKey="waitForApplyDiscountCode"/>
393406
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertApplyDiscountCode">
394407
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.textApplyDiscountCode}}"/>
395408
</actionGroup>
@@ -405,6 +418,7 @@
405418
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateApplyDiscountCode3"/>
406419

407420
<!-- Check text on sidebar "Cart Subtotal" -->
421+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.textCartSubtotal}}" stepKey="waitForCartSubtotalText"/>
408422
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertCartSubtotalText">
409423
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.textCartSubtotal}}"/>
410424
</actionGroup>
@@ -413,6 +427,7 @@
413427
<see userInput="Cart Subtotal Translated" selector="{{InlineTranslationModeCheckoutSection.textCartSubtotal}}" stepKey="seeTranslateCartSubtotalOnCheckoutText"/>
414428

415429
<!-- Check text on sidebar text "Shipping" -->
430+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.textShippingTotal}}" stepKey="waitForShippingText"/>
416431
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertShippingText">
417432
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.textShippingTotal}}"/>
418433
</actionGroup>
@@ -428,6 +443,7 @@
428443
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateShippingText3"/>
429444

430445
<!-- Check text on sidebar text "Order Total" -->
446+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.textOrderTotal}}" stepKey="waitForOrderTotalText"/>
431447
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertOrderTotalText">
432448
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.textOrderTotal}}"/>
433449
</actionGroup>
@@ -443,6 +459,7 @@
443459
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateOrderTotalText3"/>
444460

445461
<!-- Check text on sidebar title "Ship To" -->
462+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.titleShipTo}}" stepKey="waitForTitleShipTo"/>
446463
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertTitleShipTo">
447464
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.titleShipTo}}"/>
448465
</actionGroup>
@@ -458,6 +475,7 @@
458475
<actionGroup ref="StorefrontSubmitInlineTranslationFormActionGroup" stepKey="translateTitleShipTo3"/>
459476

460477
<!-- Check text on sidebar title "Shipping Method:" -->
478+
<waitForElementVisible selector="{{InlineTranslationModeCheckoutSection.titleShopVia}}" stepKey="waitForTitleShipVia"/>
461479
<actionGroup ref="AssertElementInTranslateInlineModeActionGroup" stepKey="assertTitleShipVia">
462480
<argument name="elementSelector" value="{{InlineTranslationModeCheckoutSection.titleShopVia}}"/>
463481
</actionGroup>

0 commit comments

Comments
 (0)