Skip to content

Commit dcb523a

Browse files
ysapigaysapiga
committed
Merge remote-tracking branch 'origin/MQE-2520' into 2.4-develop-sidecar-pr18
2 parents 29cfa37 + 4327fdc commit dcb523a

13 files changed

+153
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<element name="marketing" type="button" selector="#menu-magento-backend-marketing"/>
2323
<element name="system" type="button" selector="#menu-magento-backend-system"/>
2424
<element name="findPartners" type="button" selector="#menu-magento-marketplace-partners"/>
25+
<element name="contentMenuClose" type="button" selector="#menu-magento-backend-content a.action-close" timeout="30"/>
2526

2627
<!-- Navigate menu selectors -->
2728
<element name="menuItem" type="button" selector="li[data-ui-id='menu-{{dataUiId}}']" parameterized="true" timeout="30"/>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCloseContentMenuTabActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminCloseContentMenuTabActionGroup">
11+
<annotations>
12+
<description>Close tab 'Content' on main menu.</description>
13+
</annotations>
14+
<conditionalClick selector="{{AdminMenuSection.menuItem('magento-backend-content')}}" dependentSelector="{{AdminMenuSection.contentMenuClose}}" visible="true" stepKey="closeContentTab"/>
15+
</actionGroup>
16+
</actionGroups>

‎app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenContentMenuTabActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenContentMenuTabActionGroup">
11+
<annotations>
12+
<description>Open tab 'Content' on main menu.</description>
13+
</annotations>
14+
<conditionalClick selector="{{AdminMenuSection.menuItem('magento-backend-content')}}" dependentSelector="{{AdminMenuSection.contentMenuClose}}" visible="false" stepKey="openContentTab"/>
15+
</actionGroup>
16+
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Data/AdminAddressTemplateData.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="templateTypeHtml">
12+
<data key="templateType">html</data>
13+
</entity>
14+
<entity name="templateTypeOneLine">
15+
<data key="templateType">oneline</data>
16+
</entity>
17+
<entity name="templateTypeText">
18+
<data key="templateType">text</data>
19+
</entity>
20+
</entities>

‎app/code/Magento/Customer/Test/Mftf/Page/AdminCustomerConfigPage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
99
<page name="AdminCustomerConfigPage" url="admin/system_config/edit/section/customer/{{tabLink}}" area="admin" parameterized="true" module="Magento_Customer">
1010
<section name="AdminCustomerConfigSection"/>
11+
<section name="AdminCustomerConfigAddressTemplateSection"/>
1112
</page>
1213
</pages>

‎app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerAddressesSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<element name="addressesList" type="text" selector=".additional-addresses" />
1919
<element name="deleteAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action delete']" parameterized="true"/>
2020
<element name="editAdditionalAddress" type="button" selector="//tbody//tr[{{var}}]//a[@class='action edit']" parameterized="true" timeout="30"/>
21-
<element name="addNewAddress" type="button" selector="//span[text()='Add New Address']"/>
21+
<element name="addNewAddress" type="button" selector="//span[text()='Add New Address']" timeout="30"/>
2222
<element name="numberOfAddresses" type="text" selector=".toolbar-number"/>
2323
<element name="shippingAddress" type="text" selector="//div[contains(@class,'box box-shipping-address')]//div/address"/>
2424
<element name="billingAddress" type="text" selector="//div[contains(@class,'box box-billing-address')]//div/address"/>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminCustomerConfigAddressTemplateSection.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9+
<section name="AdminCustomerConfigAddressTemplateSection">
10+
<element name="addressTemplatesTab" type="button" selector=".entry-edit-head #customer_address_templates-head" timeout="30"/>
11+
<element name="addressTemplatesTabIsOpen" type="button" selector="//*[@class='entry-edit-head admin__collapsible-block']/a[@id='customer_address_templates-head' and @class='open']" timeout="30"/>
12+
<element name="addressTemplateTypeDefaultCheckbox" type="checkbox" selector="#row_customer_address_templates_{{type_of_template}} #customer_address_templates_{{type_of_template}}_inherit" timeout="30" parameterized="true"/>
13+
<element name="addressTemplateTypeValueInput" type="input" selector="#row_customer_address_templates_{{type_of_template}} #customer_address_templates_{{type_of_template}}" parameterized="true"/>
14+
</section>
15+
</sections>

‎app/code/Magento/Sales/Test/Mftf/Section/StorefrontOrderDetailsSection.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
<element name="paymentMethod" type="text" selector=".box-order-billing-method dt.title"/>
2121
<element name="shippingMethod" type="text" selector=".box-order-shipping-method div.box-content"/>
2222
<element name="productNameCell" type="text" selector="//*[contains(@class, 'product-item-name')]"/>
23-
</section>
23+
<element name="shippingAddressBlock" type="block" selector=".block-order-details-view .box-order-shipping-address .box-content"/>
24+
</section>
2425
</sections>

‎app/code/Magento/Swagger/Test/Mftf/ActionGroup/StorefrontApplyAdminTokenOnSwaggerPageActionGroup.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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="StorefrontApplyAdminTokenOnSwaggerPageActionGroup">
11+
<annotations>
12+
<description>Apply Admin Token on Swagger Page</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="token" type="string" defaultValue=""/>
16+
</arguments>
17+
18+
<clearField selector="{{SwaggerHeaderSection.apiKeyInput}}" stepKey="clearApiTokenField"/>
19+
<fillField selector="{{SwaggerHeaderSection.apiKeyInput}}" userInput="{{token}}" stepKey="fillApiTokenInput"/>
20+
<click selector="{{SwaggerHeaderSection.applyButton}}" stepKey="clickApplyButton" />
21+
</actionGroup>
22+
</actionGroups>

‎app/code/Magento/Swagger/Test/Mftf/ActionGroup/StorefrontGoToSwaggerPageActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="StorefrontGoToSwaggerPageActionGroup">
11+
<annotations>
12+
<description>Go to the swagger page</description>
13+
</annotations>
14+
15+
<amOnPage url="{{StorefrontSwaggerPage.url}}" stepKey="goToSwaggerPage"/>
16+
<waitForPageLoad stepKey="waitForSwaggerPageLoad"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Swagger/Test/Mftf/Page/SwaggerPage.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
10+
<page name="StorefrontSwaggerPage" url="/swagger" area="storefront" module="Swagger">
11+
<section name="SwaggerHeaderSection"/>
12+
<section name="SwaggerApiListSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Swagger/Test/Mftf/Section/SwaggerApiListSection.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="SwaggerApiListSection">
11+
<element name="swaggerActionTitle" type="text" selector="#operations-tag-{{operationName}}" parameterized="true"/>
12+
</section>
13+
</sections>

‎app/code/Magento/Swagger/Test/Mftf/Section/SwaggerHeaderSection.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="SwaggerHeaderSection">
11+
<element name="apiKeyInput" type="input" selector="#input_apiKey"/>
12+
<element name="applyButton" type="button" selector="#explore" timeout="30"/>
13+
</section>
14+
</sections>

0 commit comments

Comments
 (0)