Skip to content

Commit 2d7bc18

Browse files
dhorytskyidhorytskyi
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-1716
2 parents 8b5322d + be6bb89 commit 2d7bc18

File tree

1,029 files changed

+15914
-3535
lines changed

Some content is hidden

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

1,029 files changed

+15914
-3535
lines changed

‎app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@
2121
<before>
2222
<!--Enable Async Configuration-->
2323
<magentoCLI stepKey="EnableAsyncConfig" command="setup:config:set --no-interaction --config-async 1"/>
24-
<magentoCLI stepKey="ClearConfigCache" command="cache:flush"/>
24+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="ClearConfigCache">
25+
<argument name="tags" value=""/>
26+
</actionGroup>
2527
<!--Login to Admin-->
2628
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
2729
</before>
2830
<after>
2931
<magentoCLI stepKey="DisableAsyncConfig" command="setup:config:set --no-interaction --config-async 0"/>
3032
<magentoCLI stepKey="setBackDefaultConfigValue" command="config:set catalog/frontend/grid_per_page 12" />
31-
<magentoCLI stepKey="ClearConfigCache" command="cache:clean"/>
33+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="ClearConfigCache">
34+
<argument name="tags" value="config"/>
35+
</actionGroup>
3236
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
3337
</after>
3438

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
3636
<magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com"/>
3737
<!-- Delete customer -->
38+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
3839
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
3940

4041
<!-- Delete category -->
@@ -81,7 +82,9 @@
8182

8283
<!-- Save product -->
8384
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
84-
<magentoCron stepKey="runIndexCronJobs" groups="index"/>
85+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJobs">
86+
<argument name="indices" value=""/>
87+
</actionGroup>
8588

8689
<!-- Login to frontend -->
8790
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="signIn">

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@
2323
<click stepKey="resetFilters" selector="{{AdminSecondaryGridSection.resetFilters}}"/>
2424
<fillField stepKey="fillIdentifier" selector="{{searchInput}}" userInput="{{name}}"/>
2525
<click stepKey="searchForName" selector="{{AdminSecondaryGridSection.searchButton}}"/>
26+
<waitForPageLoad stepKey="waitForPageLoad" />
27+
<waitForElementClickable selector="{{AdminSecondaryGridSection.firstRow}}" stepKey="waitForResult"/>
2628
<click stepKey="clickResult" selector="{{AdminSecondaryGridSection.firstRow}}"/>
2729
<waitForPageLoad stepKey="waitForTaxRateLoad"/>
2830

2931
<!-- delete the rule -->
30-
<waitForElementVisible selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="waitForDelete"/>
32+
<waitForElementClickable selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="waitForDelete"/>
3133
<click stepKey="clickDelete" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
3234
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmationModal"/>
3335
<click stepKey="clickOk" selector="{{AdminConfirmationModalSection.ok}}"/>

‎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/AdminCatalogEmailToFriendSettingsTest.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,23 @@
1515
<title value="Admin should be able to manage settings of Email To A Friend Functionality"/>
1616
<description value="Admin should be able to enable Email To A Friend functionality in Magento Admin backend and see additional options"/>
1717
<group value="backend"/>
18-
<severity value="MINOR"></severity>
18+
<severity value="MINOR"/>
1919
<testCaseId value="MC-35895"/>
2020
<group value="pr_exclude"/>
2121
</annotations>
2222

2323
<before>
2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2525
<magentoCLI stepKey="enableSendFriend" command="config:set sendfriend/email/enabled 1"/>
26-
<magentoCLI stepKey="cacheClean" command="cache:clean config"/>
26+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
27+
<argument name="tags" value="config"/>
28+
</actionGroup>
2729
</before>
2830
<after>
2931
<magentoCLI stepKey="disableSendFriend" command="config:set sendfriend/email/enabled 0"/>
30-
<magentoCLI stepKey="cacheClean" command="cache:clean config"/>
32+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cacheClean">
33+
<argument name="tags" value="config"/>
34+
</actionGroup>
3135
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
3236
</after>
3337

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<argument name="tags" value="config full_page"/>
5252
</actionGroup>
5353
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
54+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
5455
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
5556
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
5657
</after>

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

Lines changed: 5 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,14 +32,17 @@
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 -->
3941
<comment userInput="Reset admin order filter" stepKey="resetAdminOrderFilter"/>
4042
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearOrderFilters"/>
4143
<magentoCLI command="config:set admin/dashboard/enable_charts 0" stepKey="setDisableChartsAsDefault"/>
4244
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
45+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
4346
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
4447
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4548
</after>

‎app/code/Magento/Backup/Model/ResourceModel/Db.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ public function rollBackTransaction()
301301
*/
302302
public function runCommand($command)
303303
{
304-
$this->connection->query($command);
304+
$this->connection->multiQuery($command);
305305
return $this;
306306
}
307307
}

‎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>

0 commit comments

Comments
 (0)