Skip to content

Commit c286894

Browse files
joanhejoanhe
committed
Merge remote-tracking branch 'upstream/2.4-develop' into B2B-1663
2 parents 2ca596f + ad0ba79 commit c286894

File tree

80 files changed

+1219
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1219
-173
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminDashboardWithChartsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
7070
<!-- Place Order -->
7171
<comment userInput="Place order" stepKey="placeOrder"/>
72-
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
73-
<see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
72+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
73+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessTitle"/>
7474
<see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order number is: " stepKey="seeOrderNumber"/>
7575
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
7676
<!-- Search for Order in the order grid -->

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@
120120
<!--Select payment method-->
121121
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
122122
<!-- Place Order -->
123-
<waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
124-
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
125-
123+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPlaceOrderButton"/>
124+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
126125
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
127126

128127
<!-- Login to Admin and open Order -->

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitleTest.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,8 @@
8989
<!-- Place Order -->
9090

9191
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectPaymentMethod"/>
92-
<waitForElementVisible selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton"/>
93-
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
94-
92+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPlaceOrderButton"/>
93+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
9594
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
9695

9796
<!-- Login to Admin and open Order -->

‎app/code/Magento/CatalogInventory/Test/Mftf/Test/AssociatedProductToConfigurableOutOfStockTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
110110
<!-- Checkout select Check/Money Order payment -->
111111
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
112-
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
113-
<waitForPageLoad stepKey="waitForOrderSuccessPage1"/>
112+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
113+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForOrderSuccessPage1"/>
114114
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
115115
<actionGroup ref="StorefrontSignOutActionGroup" stepKey="StorefrontSignOutActionGroup"/>
116116
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByDescriptionTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
<features value="CatalogSearch"/>
1313
<group value="CatalogSearch"/>
1414
</annotations>
15-
<!-- Perform reindex and flush cache -->
1615
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
17-
<argument name="indices" value=""/>
16+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1817
</actionGroup>
1918
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2019
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByNameTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<group value="CatalogSearch"/>
1414
</annotations>
1515

16-
<!-- Perform reindex and flush cache -->
1716
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
18-
<argument name="indices" value=""/>
17+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1918
</actionGroup>
2019
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2120
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByPriceTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<group value="CatalogSearch"/>
1414
</annotations>
1515

16-
<!-- Perform reindex and flush cache -->
1716
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
18-
<argument name="indices" value=""/>
17+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1918
</actionGroup>
2019
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2120
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductByShortDescriptionTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<group value="CatalogSearch"/>
1414
</annotations>
1515

16-
<!-- Perform reindex and flush cache -->
1716
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
18-
<argument name="indices" value=""/>
17+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1918
</actionGroup>
2019
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2120
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/AdvanceCatalogSearchSimpleProductTest/AdvanceCatalogSearchSimpleProductBySkuTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
<group value="CatalogSearch"/>
1414
</annotations>
1515

16-
<!-- Perform reindex and flush cache -->
1716
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
18-
<argument name="indices" value=""/>
17+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
1918
</actionGroup>
2019
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
2120
<argument name="tags" value=""/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchAndAddToCartBundleDynamicTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@
4343
</actionGroup>
4444
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
4545

46-
<!-- Perform reindex and flush cache -->
47-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
48-
<argument name="indices" value=""/>
49-
</actionGroup>
46+
<comment userInput="Adding the comment to replace CliIndexerReindexActionGroup action group ('indexer:reindex' commands) for preserving Backward Compatibility" stepKey="reindex"/>
5047
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
5148
<argument name="tags" value=""/>
5249
</actionGroup>

0 commit comments

Comments
 (0)