Skip to content

Commit c64d443

Browse files
author
avattam
committed
Merge branch '2.3-develop' of github.com:magento/magento2 into MC-10932-Error-when-uploading-a-Transactional-Emails-logo2
2 parents 88f2889 + 8dfe26a commit c64d443

File tree

264 files changed

+6104
-1076
lines changed

Some content is hidden

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

264 files changed

+6104
-1076
lines changed

‎app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
1111
<page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
1212
<section name="AdminMenuSection"/>
1313
</page>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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">
10-
1111
<actionGroup name="AdminOrderBraintreeFillActionGroup">
1212
<!--Select Braintree Payment method on Admin Order Create Page-->
1313
<click stepKey="chooseBraintree" selector="{{NewOrderSection.creditCardBraintree}}"/>
@@ -39,4 +39,4 @@
3939
<wait stepKey="waitForFillCVV" time="1"/>
4040
<switchToIFrame stepKey="switchBackFromCVV"/>
4141
</actionGroup>
42-
</actionGroups>
42+
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
108

9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="GoToUserRoles">
1212
<click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
1313
<waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
@@ -34,7 +34,6 @@
3434
<see userInput="You saved the role." stepKey="seeSuccessMessage" />
3535
</actionGroup>
3636

37-
3837
<!--Delete role-->
3938
<actionGroup name="AdminDeleteRoleActionGroup">
4039
<arguments>

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
108

9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!--Go to all users-->
1212
<actionGroup name="GoToAllUsers">
1313
<click selector="{{AdminCreateUserSection.system}}" stepKey="clickOnSystemIcon"/>
@@ -39,7 +39,6 @@
3939
<see userInput="You saved the user." stepKey="seeSuccessMessage" />
4040
</actionGroup>
4141

42-
4342
<!--Delete User-->
4443
<actionGroup name="AdminDeleteNewUserActionGroup">
4544

‎app/code/Magento/Braintree/Test/Mftf/ActionGroup/StorefrontFillCartDataActionGroup.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,27 @@
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="StorefrontFillCartDataActionGroup">
1111
<arguments>
1212
<argument name="cartData" defaultValue="PaymentAndShippingInfo"/>
1313
</arguments>
1414
<switchToIFrame selector="{{BraintreeConfigurationPaymentSection.cartFrame}}" stepKey="switchToIframe"/>
15+
<waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.cartCode}}" stepKey="waitCartCodeElement"/>
1516
<fillField selector="{{BraintreeConfigurationPaymentSection.cartCode}}" userInput="{{cartData.cardNumber}}" stepKey="setCartCode"/>
1617
<switchToIFrame stepKey="switchBack"/>
1718
<switchToIFrame selector="{{BraintreeConfigurationPaymentSection.monthFrame}}" stepKey="switchToIframe1"/>
19+
<waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.month}}" stepKey="waitMonthElement"/>
1820
<fillField selector="{{BraintreeConfigurationPaymentSection.month}}" userInput="{{cartData.month}}" stepKey="setMonth"/>
1921
<switchToIFrame stepKey="switchBack1"/>
2022
<switchToIFrame selector="{{BraintreeConfigurationPaymentSection.yearFrame}}" stepKey="switchToIframe2"/>
23+
<waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.year}}" stepKey="waitYearElement"/>
2124
<fillField selector="{{BraintreeConfigurationPaymentSection.year}}" userInput="{{cartData.year}}" stepKey="setYear"/>
2225
<switchToIFrame stepKey="switchBack2"/>
2326
<switchToIFrame selector="{{BraintreeConfigurationPaymentSection.codeFrame}}" stepKey="switchToIframe3"/>
27+
<waitForElementVisible selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" stepKey="waitVerificationNumber"/>
2428
<fillField selector="{{BraintreeConfigurationPaymentSection.verificationNumber}}" userInput="{{cartData.cvv}}" stepKey="setVerificationNumber"/>
2529
<switchToIFrame stepKey="SwitchBackToWindow"/>
26-
2730
</actionGroup>
2831

2932
</actionGroups>

‎app/code/Magento/Braintree/Test/Mftf/Section/AdminEditRoleInfoSection.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminEditRoleInfoSection">
12+
<element name="roleName" type="input" selector="#role_name"/>
13+
<element name="password" type="input" selector="#current_password"/>
14+
<element name="roleResourcesTab" type="button" selector="#role_info_tabs_account"/>
15+
<element name="backButton" type="button" selector="button[title='Back']"/>
16+
<element name="resetButton" type="button" selector="button[title='Reset']"/>
17+
<element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
18+
<element name="saveButton" type="button" selector="button[title='Save Role']"/>
19+
<element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
20+
<element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
21+
<element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
22+
</section>
23+
</sections>

‎app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserRoleSection.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminEditUserRoleSection">
12+
<element name="usernameTextField" type="input" selector="#user_username"/>
13+
<element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
14+
<element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
15+
<element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
16+
<element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
17+
<element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
18+
</section>
19+
</sections>

‎app/code/Magento/Braintree/Test/Mftf/Section/AdminEditUserSection.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminEditUserSection">
12+
<element name="system" type="input" selector="#menu-magento-backend-system"/>
13+
<element name="allUsers" type="input" selector="//span[contains(text(), 'All Users')]"/>
14+
<element name="create" type="input" selector="#add"/>
15+
<element name="usernameTextField" type="input" selector="#user_username"/>
16+
<element name="firstNameTextField" type="input" selector="#user_firstname"/>
17+
<element name="lastNameTextField" type="input" selector="#user_lastname"/>
18+
<element name="emailTextField" type="input" selector="#user_email"/>
19+
<element name="passwordTextField" type="input" selector="#user_password"/>
20+
<element name="pwConfirmationTextField" type="input" selector="#user_confirmation"/>
21+
<element name="currentPasswordField" type="input" selector="#user_current_password"/>
22+
<element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>
23+
<element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
24+
<element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
25+
<element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
26+
<element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
27+
<element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
28+
<element name="saveButton" type="button" selector="#save"/>
29+
</section>
30+
</sections>

‎app/code/Magento/Braintree/Test/Mftf/Section/AdminMenuSection.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminMenuSection">
12+
<element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
13+
<element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
14+
<element name="catalog" type="button" selector="//li[@id='menu-magento-catalog-catalog']"/>
15+
<element name="customers" type="button" selector="//li[@id='menu-magento-customer-customer']"/>
16+
<element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
17+
<element name="content" type="button" selector="//li[@id='menu-magento-backend-content']"/>
18+
<element name="reports" type="button" selector="//li[@id='menu-magento-reports-report']"/>
19+
<element name="stores" type="button" selector="//li[@id='menu-magento-backend-stores']"/>
20+
<element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
21+
<element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
22+
</section>
23+
</sections>

‎app/code/Magento/Braintree/Test/Mftf/Section/AdminRoleGridSection.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminRoleGridSection">
12+
<element name="idFilterTextField" type="input" selector="#roleGrid_filter_role_id"/>
13+
<element name="roleNameFilterTextField" type="input" selector="#roleGrid_filter_role_name"/>
14+
<element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
15+
<element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
16+
<element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
17+
<element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
18+
</section>
19+
</sections>

0 commit comments

Comments
 (0)