Skip to content

Commit 7c12803

Browse files
dhorytskyidhorytskyi
committed
Merge branch '2.3-develop' of https://github.com/magento/magento2ce into MC-18833
2 parents 3121dfe + 7d5f1b0 commit 7c12803

File tree

717 files changed

+5354
-1220
lines changed

Some content is hidden

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

717 files changed

+5354
-1220
lines changed

‎app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
</field>
5656
<field id="search_suggestion_count" translate="label" type="text" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="1">
5757
<label>Search Suggestions Count</label>
58+
<validate>validate-digits validate-zero-or-greater</validate>
5859
<depends>
5960
<field id="search_suggestion_enabled">1</field>
6061
</depends>

‎app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ConfigureAuthorizenetAcceptjsActionGroup.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1011
<actionGroup name="ConfigureAuthorizenetAcceptjs" extends="EnableAuthorizenetAcceptjs">
12+
<annotations>
13+
<description>Sets up the Authorize.net Accept JS configuration setting with a specified Payment action.</description>
14+
</annotations>
1115
<arguments>
1216
<argument name="paymentAction" type="string"/>
1317
</arguments>
@@ -23,6 +27,10 @@
2327
</actionGroup>
2428

2529
<actionGroup name="DisableAuthorizenetAcceptjs">
30+
<annotations>
31+
<description>Disables the Authorize.net Accept JS configuration setting via the CLI.</description>
32+
</annotations>
33+
2634
<magentoCLI stepKey="disableAuthorizenetAcceptjs" command="config:set payment/authorizenet_acceptjs/active 0"/>
2735
</actionGroup>
2836

‎app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/FillPaymentInformationActionGroup.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1011
<actionGroup name="FillPaymentInformation">
12+
<annotations>
13+
<description>Fill Payment Method with Authorize.net</description>
14+
</annotations>
15+
1116
<click stepKey="clickOnAuthorizenetToggle" selector="{{AuthorizenetCheckoutSection.selectAuthorizenet}}"/>
1217
<waitForPageLoad stepKey="waitForCardDataSection"/>
1318
<fillField stepKey="fillCardNumber" selector="{{AuthorizenetCheckoutSection.cardInput}}" userInput="{{PaymentAndShippingInfo.cardNumber}}"/>
@@ -18,12 +23,16 @@
1823
<waitForPageLoad stepKey="waitForCheckout"/>
1924
</actionGroup>
2025

21-
<!-- Guest checkout Authorizenet fill billing address -->
26+
<!-- Guest checkout Authorize.net fill billing address -->
2227
<actionGroup name="GuestCheckoutAuthorizenetFillBillingAddress">
28+
<annotations>
29+
<description>Fill Billing Address as Guest with Authorize.net</description>
30+
</annotations>
2331
<arguments>
2432
<argument name="customer"/>
2533
<argument name="customerAddress"/>
2634
</arguments>
35+
2736
<fillField selector="{{GuestAuthorizenetCheckoutSection.firstName}}" userInput="{{customer.firstName}}" stepKey="fillFirstName"/>
2837
<fillField selector="{{GuestAuthorizenetCheckoutSection.lastName}}" userInput="{{customer.lastName}}" stepKey="fillLastName"/>
2938
<fillField selector="{{GuestAuthorizenetCheckoutSection.street}}" userInput="{{customerAddress.street[0]}}" stepKey="fillStreet"/>

‎app/code/Magento/AuthorizenetAcceptjs/Test/Mftf/ActionGroup/ViewAndValidateOrderActionGroup.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,20 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1011
<actionGroup name="ViewAndValidateOrderActionGroup">
12+
<annotations>
13+
<description>Validate the Order is Correct. Then Submit the Invoice.</description>
14+
</annotations>
1115
<arguments>
1216
<argument name="amount" type="string"/>
1317
<argument name="status" type="string"/>
1418
<argument name="captureStatus" type="string"/>
1519
<argument name="closedStatus" type="string"/>
1620
</arguments>
21+
1722
<amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
1823
<click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
1924
<waitForPageLoad stepKey="waitForSalesSubsection"/>
@@ -39,13 +44,18 @@
3944
<see userInput="{{closedStatus}}" selector="{{ViewOrderSection.confirmClosed}}" stepKey="seeClosed"/>
4045
-->
4146
</actionGroup>
47+
4248
<actionGroup name="ViewAndValidateOrderActionGroupNoSubmit">
49+
<annotations>
50+
<description>Validate the Order is Correct. Do Not Submit the Invoice.</description>
51+
</annotations>
4352
<arguments>
4453
<argument name="amount" type="string"/>
4554
<argument name="status" type="string"/>
4655
<argument name="captureStatus" type="string"/>
4756
<argument name="closedStatus" type="string"/>
4857
</arguments>
58+
4959
<amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
5060
<click selector="{{AdminMenuSection.sales}}" stepKey="clickSales"/>
5161
<waitForPageLoad stepKey="waitForSalesSubsection"/>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminAssertPageTitleActionGroup">
12+
<annotations>
13+
<description>Validate Backend Admin Grid Page Title is present and correct.</description>
14+
</annotations>
1215
<arguments>
1316
<argument name="title" type="string"/>
1417
</arguments>
18+
1519
<see selector="{{AdminGridHeaders.title}}" userInput="{{title}}" stepKey="assertPageTitle"/>
1620
</actionGroup>
1721
</actionGroups>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminNavigateMenuActionGroup">
12+
<annotations>
13+
<description>Open Backend Admin side Navigation Menu. Click on Sub-Navigation Menu item.</description>
14+
</annotations>
1215
<arguments>
1316
<argument name="menuUiId" type="string"/>
1417
<argument name="submenuUiId" type="string"/>
1518
</arguments>
19+
1620
<click selector="{{AdminMenuSection.menuItem(menuUiId)}}" stepKey="clickOnMenuItem"/>
1721
<click selector="{{AdminMenuSection.menuItem(submenuUiId)}}" stepKey="clickOnSubmenuItem"/>
1822
</actionGroup>

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

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

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AssertAdminDashboardPageIsVisibleActionGroup">
12+
<annotations>
13+
<description>Validate the Backend Admin Dashboard URI is correct. Validate the Backend Admin Dashboard Title is present and correct.</description>
14+
</annotations>
15+
1216
<seeInCurrentUrl url="{{AdminDashboardPage.url}}" stepKey="seeDashboardUrl"/>
1317
<see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
1418
</actionGroup>

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

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

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AssertAdminPageIsNot404ActionGroup">
12+
<annotations>
13+
<description>Validates that the '404 Error' message is present and correct in the Admin Page Header.</description>
14+
</annotations>
15+
1216
<dontSee userInput="404 Error" selector="{{AdminHeaderSection.pageHeading}}" stepKey="dontSee404PageHeading"/>
1317
</actionGroup>
1418
</actionGroups>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AssertAdminSuccessLoginActionGroup">
12-
<waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible" />
12+
<annotations>
13+
<description>Wait for the current Admin Name to appear in the Backend Admin.</description>
14+
</annotations>
15+
16+
<waitForElementVisible selector="{{AdminHeaderSection.adminUserAccountText}}" stepKey="waitForAdminAccountTextVisible"/>
1317
</actionGroup>
1418
</actionGroups>

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AssertMessageInAdminPanelActionGroup">
12+
<annotations>
13+
<description>Validates that the provided Message appears in the provided Message Type on an Admin page.</description>
14+
</annotations>
1215
<arguments>
13-
<argument name="message" type="string" />
14-
<argument name="messageType" type="string" defaultValue="success" />
16+
<argument name="message" type="string"/>
17+
<argument name="messageType" type="string" defaultValue="success"/>
1518
</arguments>
1619

17-
<waitForElementVisible selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="waitForMessageVisible" />
18-
<see userInput="{{message}}" selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage" />
20+
<waitForElementVisible selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="waitForMessageVisible"/>
21+
<see userInput="{{message}}" selector="{{AdminMessagesSection.messageByType(messageType)}}" stepKey="verifyMessage"/>
1922
</actionGroup>
2023
</actionGroups>

0 commit comments

Comments
 (0)