Skip to content

Commit 5a33522

Browse files
engcom-Deltaengcom-Delta
committed
Merge remote-tracking branch 'magento/2.4-develop' into no-author/catalog-01
2 parents ee9c0bd + d0aa378 commit 5a33522

File tree

157 files changed

+493
-225
lines changed

Some content is hidden

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

157 files changed

+493
-225
lines changed

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="clickFoundUsername"/>
3636
<waitForPageLoad time="30" stepKey="wait2"/>
3737
<seeInField selector="{{AdminEditUserSection.usernameTextField}}" userInput="$$noReportUser.username$$" stepKey="seeUsernameInField"/>
38-
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
38+
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
3939
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
4040

4141
<click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>

‎app/code/Magento/AsyncConfig/Test/Mftf/Suite/AsyncOperationsSuite.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
11+
<suite name="AsyncOperationsSuite">
12+
<include>
13+
<group name="async_operations"/>
14+
</include>
15+
</suite>
16+
</suites>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<severity value="MAJOR"/>
1717
<testCaseId value="ACPT-885"/>
1818
<group value="configuration"/>
19+
<group value="async_operations" />
1920
</annotations>
2021
<before>
2122
<!--Enable Async Configuration-->

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
</annotations>
1515
<arguments>
1616
<argument name="username" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_USERNAME}}"/>
17-
<argument name="password" type="string" defaultValue="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}"/></arguments>
17+
<argument name="password" type="string" defaultValue="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}"/>
18+
</arguments>
1819

1920
<amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
2021
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{username}}" stepKey="fillUsername"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<waitForElementVisible selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="waitForInterfaceLocale"/>
2121
<!-- Change Admin locale to Français (France) / French (France) -->
2222
<selectOption userInput="{{InterfaceLocaleByValue}}" selector="{{AdminSystemAccountSection.interfaceLocale}}" stepKey="setInterfaceLocate"/>
23-
<fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
23+
<fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}" stepKey="fillPassword"/>
2424
<click selector="{{AdminMainActionsSection.save}}" stepKey="clickSave"/>
2525
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitSuccessMessage"/>
2626
<see selector="{{AdminMessagesSection.success}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</annotations>
2323

2424
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin">
25-
<argument name="password" value="INVALID!{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
25+
<argument name="password" value="INVALID!"/>
2626
</actionGroup>
2727
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="assertErrorMessage"/>
2828
</test>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="AdminFilterProductListByBundleProductInDutchUserLanguageTest">
11+
<test name="AdminFilterProductListByBundleProductInDutchUserLanguageTest">
1212
<annotations>
1313
<features value="Bundle"/>
1414
<stories value="Admin list bundle products when user language is set as Dutch"/>
@@ -42,6 +42,12 @@
4242
<argument name="InterfaceLocaleByValue" value="en_US" />
4343
</actionGroup>
4444
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
45+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
46+
<argument name="indices" value=""/>
47+
</actionGroup>
48+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanInvalidatedCaches">
49+
<argument name="tags" value="config full_page"/>
50+
</actionGroup>
4551
</after>
4652

4753
<!-- Change Admin locale to Nederlands (Nederland) / Nederlands (Nederland) -->

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</before>
8585
<after>
8686
<!--Remove default flat rate shipping method settings-->
87-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
87+
<comment userInput="config:set DisableFlatRateConfigData.path DisableFlatRateConfigData.value" stepKey="disableFlatRate"/>
8888
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
8989
<deleteData createDataKey="createCustomer2" stepKey="deleteCustomer2"/>
9090

@@ -110,7 +110,7 @@
110110
<amOnPage url="{{AdminProductEditPage.url($$createBundleProduct.id$$)}}" stepKey="openBundleProductEditPage"/>
111111

112112
<!--Create new customer order.-->
113-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
113+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
114114
<argument name="customer" value="$createCustomer$"/>
115115
</actionGroup>
116116
<!--Add bundle product to order.-->
@@ -134,7 +134,7 @@
134134
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
135135
<wait time="2" stepKey="waitForPageLoad1"/>
136136
<!--Create new customer order.-->
137-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer2">
137+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer2">
138138
<argument name="customer" value="$createCustomer2$"/>
139139
</actionGroup>
140140
<!--Add bundle product to order.-->

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCheckProductByIdOnProductGridActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCheckProductByIdOnProductGridActionGroup">
12+
<annotations>
13+
<description>Check the checkbox for the product on the Product Grid using Product ID</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="productId" type="string"/>
17+
</arguments>
18+
19+
<waitForElementClickable selector="{{AdminProductGridSection.productRowCheckboxById(productId)}}" stepKey="waitForElementClickable" />
20+
<checkOption selector="{{AdminProductGridSection.productRowCheckboxById(productId)}}" stepKey="selectProduct"/>
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/SortProductsByIdDescendingActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515

1616
<conditionalClick selector="{{AdminProductGridTableHeaderSection.id('ascend')}}" dependentSelector="{{AdminProductGridTableHeaderSection.id('descend')}}" visible="false" stepKey="sortById"/>
1717
<waitForPageLoad stepKey="waitForPageLoad"/>
18+
<wait time="5" stepKey="simpleWait" />
1819
</actionGroup>
1920
</actionGroups>

0 commit comments

Comments
 (0)