Skip to content

Commit e2a2ccd

Browse files
committed
Merge remote-tracking branch 'origin/ENGCOM-3491-magento-magento2-19182' into ENGCOM-3491-magento-magento2-19182
2 parents 67e886a + 9693128 commit e2a2ccd

File tree

136 files changed

+1092
-735
lines changed

Some content is hidden

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

136 files changed

+1092
-735
lines changed

app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,10 @@
1616
<element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
1717
<element name="stores" type="button" selector="#menu-magento-backend-stores"/>
1818
<element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
19+
<element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
20+
<element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
21+
<element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
22+
<element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
23+
<element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
1924
</section>
2025
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<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">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010

1111
<actionGroup name="AdminOrderBraintreeFillActionGroup">
1212
<!--Select Braintree Payment method on Admin Order Create Page-->

app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- GoTo ConfigureBraintree fields -->
1313
<click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
1414
<waitForPageLoad stepKey="waitForConfiguration" time="2"/>
15-
<click stepKey="clickOnConfigurations" selector="{{StoresSubmenuSection.configuration}}" />
15+
<click stepKey="clickOnConfigurations" selector="{{AdminMenuSection.configuration}}" />
1616
<waitForPageLoad stepKey="waitForSales" time="2"/>
1717
<click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
1818
<waitForPageLoad stepKey="waitForPaymentMethods" time="2"/>

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

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

Lines changed: 0 additions & 28 deletions
This file was deleted.

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

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/code/Magento/Braintree/Test/Mftf/Section/BraintreeConfiguraionSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
910
<section name="BraintreeConfiguraionSection">
1011
<element name="titleForBraintreeSettings" type="input" selector="//input[@id='payment_us_braintree_section_braintree_braintree_required_title']"/>
1112
<element name="environment" type="select" selector="//select[@id='payment_us_braintree_section_braintree_braintree_required_environment']"/>

app/code/Magento/Braintree/Test/Mftf/Section/ConfigurationPaymentSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
-->
88

99
<sections 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/SectionObject.xsd">
11-
<section name="ConfigurationPaymentSection">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="ConfigurationPaymentSection">
1212
<element name="configureButton" type="button" selector="//button[@id='payment_us_braintree_section_braintree-head']"/>
1313
</section>
1414
</sections>

0 commit comments

Comments
 (0)