Skip to content

Commit 77bdc33

Browse files
committed
B2B-2117: Prepare AWS Aurora Functional Test CI Build for Handing Off to GL Team
- Fixing flaky tests
1 parent a9ed209 commit 77bdc33

6 files changed

+9
-2
lines changed

app/code/Magento/Checkout/Test/Mftf/ActionGroup/ClickViewAndEditCartFromMiniCartActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
1919
<click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="viewAndEditCart"/>
2020
<waitForPageLoad stepKey="waitForPageToLoad"/>
21+
<waitForElementVisible selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="waitForOrderTotal"/>
22+
<waitForPageLoad stepKey="waitForOrderTotalCalculation"/>
2123
<seeInCurrentUrl url="checkout/cart" stepKey="seeInCurrentUrl"/>
2224
</actionGroup>
2325
</actionGroups>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCartFromMinicartActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@
1919
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickShowMinicart"/>
2020
<click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="clickCart"/>
2121
<waitForPageLoad stepKey="waitForCart"/>
22+
<waitForElementVisible selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="waitForOrderTotal"/>
23+
<waitForPageLoad stepKey="waitForOrderTotalCalculation"/>
2224
</actionGroup>
2325
</actionGroups>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenMiniCartActionGroup/ClickViewAndEditCartFromMiniCartActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<waitForElementVisible selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="waitForViewAndEditCartVisible"/>
1818
<click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="viewAndEditCart"/>
1919
<waitForPageLoad stepKey="waitForPageToLoad"/>
20+
<waitForElementVisible selector="{{CheckoutPaymentSection.orderSummaryTotal}}" stepKey="waitForOrderTotal"/>
21+
<waitForPageLoad stepKey="waitForOrderTotalCalculation"/>
2022
<seeInCurrentUrl url="checkout/cart" stepKey="seeInCurrentUrl"/>
2123
</actionGroup>
2224
</actionGroups>

app/code/Magento/Checkout/Test/Mftf/Test/NoErrorCartCheckoutForProductsDeletedFromMiniCartTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity"/>
4343
<!-- open the minicart -->
4444
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickShowMinicart1"/>
45-
<click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="editProductFromMiniCart"/>
45+
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="editProductFromMiniCart"/>
4646
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickShowMinicart2"/>
4747
<click selector="{{StorefrontMinicartSection.deleteMiniCartItem}}" stepKey="deleteMiniCartItem"/>
4848
<waitForElementVisible selector="{{StoreFrontRemoveItemModalSection.message}}" stepKey="waitFortheConfirmationModal"/>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontProductNameMinicartOnCheckoutPageDifferentStoreViewsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</assertStringContainsString>
8585

8686
<!--Check product name in Shopping Cart page-->
87-
<click selector="{{StorefrontMinicartSection.viewAndEditCart}}" stepKey="clickViewAndEdit"/>
87+
<actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="clickViewAndEdit"/>
8888
<waitForPageLoad stepKey="waitForShoppingCartPageLoad"/>
8989
<grabTextFrom selector="{{CheckoutCartProductSection.productName}}" stepKey="grabProductNameCart"/>
9090
<assertStringContainsString stepKey="assertProductNameCart">

app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontAddConfigurableProductToTheCartActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
<amOnPage url="{{urlKey}}.html" stepKey="goToStorefrontPage"/>
2323
<waitForPageLoad stepKey="waitForProductFrontPageToLoad"/>
24+
<waitForElementVisible selector="{{StorefrontProductInfoMainSection.productOptionSelect(productAttribute)}}" stepKey="waitForOptions"/>
2425
<selectOption selector="{{StorefrontProductInfoMainSection.productOptionSelect(productAttribute)}}" userInput="{{productOption}}" stepKey="selectOption1"/>
2526
<fillField selector="{{StorefrontProductPageSection.qtyInput}}" userInput="{{qty}}" stepKey="fillProductQuantity"/>
2627
<waitForElementNotVisible selector="{{StorefrontProductActionSection.addToCartDisabled}}" stepKey="waitForAddToCartButtonToRemoveDisabledState"/>

0 commit comments

Comments
 (0)