Skip to content

Commit 567b3ea

Browse files
okolesnykokolesnyk
committed
Merge branch 'stability_control' of github.com:magento-commerce/magento2ce into stability_control
2 parents 7c942ff + d5641af commit 567b3ea

File tree

419 files changed

+1795
-644
lines changed

Some content is hidden

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

419 files changed

+1795
-644
lines changed

‎app/code/Magento/AwsS3/Test/Mftf/Test/AwsS3AdminCreateDownloadableProductWithLinkTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@
8181

8282
<!-- Save product -->
8383
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
84-
<magentoCron stepKey="runIndexCronJobs" groups="index"/>
84+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
85+
<argument name="indices" value=""/>
86+
</actionGroup>
8587

8688
<!-- Login to frontend -->
8789
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="signIn">

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@
5858
<actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView10">
5959
<argument name="customStore" value="storeViewData7"/>
6060
</actionGroup>
61-
<magentoCron groups="index" stepKey="reindex"/>
61+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
62+
<argument name="indices" value=""/>
63+
</actionGroup>
6264

6365
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
6466
</after>
@@ -94,7 +96,9 @@
9496
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView10">
9597
<argument name="customStore" value="storeViewData7"/>
9698
</actionGroup>
97-
<magentoCron groups="index" stepKey="reindex"/>
99+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
100+
<argument name="indices" value=""/>
101+
</actionGroup>
98102

99103
<!--Navigate to Product attribute page-->
100104
<actionGroup ref="AdminNavigateToNewProductAttributePageActionGroup" stepKey="navigateToNewProductAttributePage"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<group value="backend"/>
2121
<skip>
2222
<issueId value="DEPRECATED">Use AdminCheckDashboardWithChartsTest instead</issueId>
23-
</skip>
23+
</skip>
2424
<group value="pr_exclude"/>
2525
</annotations>
2626
<before>
@@ -32,7 +32,9 @@
3232
<field key="firstname">John1</field>
3333
<field key="lastname">Doe1</field>
3434
</createData>
35-
<magentoCron stepKey="runCronIndex" groups="index"/>
35+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronIndex">
36+
<argument name="indices" value=""/>
37+
</actionGroup>
3638
</before>
3739
<after>
3840
<!-- Reset admin order filter -->

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@
6262
<requiredEntity createDataKey="simpleProduct4"/>
6363
</createData>
6464

65-
<magentoCron stepKey="runCronIndex" groups="index"/>
65+
<magentoCLI command="indexer:reindex" stepKey="runCronIndex"/>
6666
</actionGroup>
6767
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@
7070
<requiredEntity createDataKey="createBundleRadioButtonsOption"/>
7171
<requiredEntity createDataKey="simpleProduct2"/>
7272
</createData>
73-
<magentoCron stepKey="runCronIndex" groups="index"/>
73+
<magentoCLI command="indexer:reindex" stepKey="runCronIndex"/>
7474
</actionGroup>
7575
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminCreateApiFixedBundleProductActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@
6161
<requiredEntity createDataKey="createBundleOption1_2"/>
6262
<requiredEntity createDataKey="simpleProduct4"/>
6363
</createData>
64-
<magentoCron stepKey="runCronIndex" groups="index"/>
64+
<magentoCLI command="indexer:reindex" stepKey="runCronIndex"/>
6565
</actionGroup>
6666
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
<createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
2626
<createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
2727
<createData entity="SimpleProduct2" stepKey="simpleProduct3"/>
28-
<magentoCron stepKey="runCronIndex" groups="index"/>
28+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronIndex">
29+
<argument name="indices" value=""/>
30+
</actionGroup>
2931
<actionGroup stepKey="loginToAdminPanel" ref="AdminLoginActionGroup"/>
3032
</before>
3133
<after>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleProductToCartFromWishListPageTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
<requiredEntity createDataKey="bundleOption"/>
5252
<requiredEntity createDataKey="createSimpleProduct2"/>
5353
</createData>
54-
<magentoCron stepKey="runCronIndex" groups="index"/>
54+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronIndex">
55+
<argument name="indices" value=""/>
56+
</actionGroup>
5557

5658
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
5759
<argument name="productId" value="$$createProduct.id$$"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAddDefaultImageBundleProductTest.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2424
<createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
2525
<createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
26-
<magentoCron stepKey="runCronIndex" groups="index"/>
26+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runCronIndex">
27+
<argument name="indices" value=""/>
28+
</actionGroup>
2729
</before>
2830
<after>
2931
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
@@ -59,7 +61,7 @@
5961
</actionGroup>
6062
<actionGroup ref="AdminCheckFirstCheckboxInAddProductsToOptionPanelGridActionGroup" stepKey="selectFirstGridRow2"/>
6163
<click selector="{{AdminAddProductsToOptionPanel.addSelectedProducts}}" stepKey="clickAddSelectedBundleProducts"/>
62-
64+
6365
<actionGroup ref="AdminFillBundleItemQtyActionGroup" stepKey="fillProductDefaultQty1">
6466
<argument name="optionIndex" value="0"/>
6567
<argument name="productIndex" value="0"/>

‎app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@
6363
<argument name="StoreGroup" value="SecondStoreGroupUnique"/>
6464
<argument name="customStore" value="SecondStoreUnique"/>
6565
</actionGroup>
66-
<magentoCron groups="index" stepKey="reindex2"/>
66+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex2">
67+
<argument name="indices" value=""/>
68+
</actionGroup>
6769
</before>
6870
<after>
6971
<!-- Disabled Store URLs -->
@@ -78,7 +80,9 @@
7880
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
7981
<argument name="websiteName" value="{{secondCustomWebsite.name}}"/>
8082
</actionGroup>
81-
<magentoCron groups="index" stepKey="reindex"/>
83+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
84+
<argument name="indices" value=""/>
85+
</actionGroup>
8286

8387
<actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="resetProductGridFilter"/>
8488

0 commit comments

Comments
 (0)