Skip to content

Commit 4327fdc

Browse files
dimonovpdimonovp
committed
Merge branch '2.4-develop' into MQE-2520
2 parents afeca9c + 613577d commit 4327fdc

File tree

8 files changed

+114
-0
lines changed

8 files changed

+114
-0
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/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)