Skip to content

Commit b6e7f4d

Browse files
okolesnykokolesnyk
committed
MQE-1714: Community MTF to MFTF test conversion code review
 - minor fixes and added testCaseId
1 parent fa5b871 commit b6e7f4d

11 files changed

+157
-15
lines changed

‎app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInDeveloperModeTest.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,24 @@
1414
<title value="Check locale dropdown and developer configuration page are available in developer mode"/>
1515
<description value="Check locale dropdown and developer configuration page are available in developer mode"/>
1616
<group value="backend"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-20374"/>
19+
<group value="developer_mode_only"/>
1720
<group value="mtf_migrated"/>
1821
</annotations>
1922
<before>
20-
<magentoCLI command="deploy:mode:set developer" stepKey="enableDeveloperMode"/>
2123
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2224
</before>
2325

2426
<!-- Go to the general configuration and make sure the locale dropdown is available and enabled -->
25-
<actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToGeneralConfigurationPage"/>
27+
<actionGroup ref="AdminOpenStoreConfigPageActionGroup" stepKey="openStoreConfigPage" />
28+
<scrollTo selector="{{LocaleOptionsSection.sectionHeader}}" stepKey="scrollToLocaleSection" y="-80" />
2629
<conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
2730
<seeElement selector="{{LocaleOptionsSection.localeEnabled}}" stepKey="seeEnabledLocaleDropdown"/>
2831

2932
<!-- Go to the developer configuration and make sure the page is available -->
30-
<actionGroup ref="NavigateToConfigurationDeveloperPage" stepKey="goToDeveloperConfigPage"/>
33+
<actionGroup ref="AdminOpenStoreConfigDeveloperPageActionGroup" stepKey="goToDeveloperConfigPage"/>
3134
<seeInCurrentUrl url="{{AdminConfigDeveloperPage.url}}" stepKey="seeDeveloperConfigUrl"/>
35+
<seeElement selector="{{AdminConfigSection.navItemByTitle('Developer')}}" stepKey="assertDeveloperNavItemPresent" />
3236
</test>
3337
</tests>

‎app/code/Magento/Backend/Test/Mftf/Test/AdminCheckLocaleAndDeveloperConfigInProductionModeTest.xml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,34 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="AdminCheckLocaleAndDeveloperConfigInProductionMode">
11+
<test name="AdminCheckLocaleAndDeveloperConfigInProductionModeTest">
1212
<annotations>
1313
<features value="Backend"/>
1414
<title value="Check locale dropdown and developer configuration page are not available in production mode"/>
1515
<description value="Check locale dropdown and developer configuration page are not available in production mode"/>
16+
<testCaseId value="MC-14106" />
17+
<severity value="MAJOR"/>
1618
<group value="backend"/>
19+
<group value="production_mode_only"/>
1720
<group value="mtf_migrated"/>
1821
</annotations>
1922
<before>
20-
<magentoCLI command="deploy:mode:set production" stepKey="enableDeveloperMode"/>
2123
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2224
</before>
2325

2426
<!-- Go to the general configuration and make sure the locale dropdown is disabled -->
25-
<actionGroup ref="NavigateToConfigurationGeneralPage" stepKey="navigateToGeneralConfigurationPage"/>
27+
<actionGroup ref="AdminOpenStoreConfigPageActionGroup" stepKey="openStoreConfigPage" />
28+
<scrollTo selector="{{LocaleOptionsSection.sectionHeader}}" stepKey="scrollToLocaleSection" y="-80" />
2629
<conditionalClick selector="{{LocaleOptionsSection.sectionHeader}}" dependentSelector="{{LocaleOptionsSection.timezone}}" visible="false" stepKey="openLocaleSection"/>
27-
<seeElement selector="{{LocaleOptionsSection.localeDisabled}}" stepKey="seeEnabledLocaleDropdown"/>
30+
<assertElementContainsAttribute selector="{{LocaleOptionsSection.locale}}" attribute="disabled" stepKey="seeDisabledLocaleDropdown" />
2831

2932
<!-- Go to the developer configuration and make sure the redirect to the configuration page takes place -->
30-
<actionGroup ref="NavigateToConfigurationDeveloperPage" stepKey="goToDeveloperConfigPage"/>
33+
<actionGroup ref="AdminOpenStoreConfigDeveloperPageActionGroup" stepKey="goToDeveloperConfigPage"/>
3134
<seeInCurrentUrl url="{{AdminConfigPage.url}}index/" stepKey="seeConfigurationIndexUrl"/>
35+
36+
<actionGroup ref="AdminExpandConfigTabActionGroup" stepKey="expandAdvancedTab">
37+
<argument name="tabName" value="Advanced" />
38+
</actionGroup>
39+
<dontSeeElement selector="{{AdminConfigSection.navItemByTitle('Developer')}}" stepKey="assertDeveloperNavItemAbsent" />
3240
</test>
3341
</tests>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandConfigTabActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminExpandConfigTabActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page and expands main level configuration tab passed via argument as Tab Name.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="tabName" type="string"/>
17+
</arguments>
18+
19+
<scrollTo stepKey="scrollToTab" selector="{{AdminConfigSection.collapsibleTabByTitle(tabName)}}" y="-80"/>
20+
<conditionalClick selector="{{AdminConfigSection.collapsibleTabByTitle(tabName)}}" dependentSelector="{{AdminConfigSection.expandedTabByTitle(tabName)}}" visible="false" stepKey="expandTab" />
21+
<waitForElement selector="{{AdminConfigSection.expandedTabByTitle(tabName)}}" stepKey="waitOpenedTab" />
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenConfigNavItemActionGroup.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenConfigNavItemActionGroup">
12+
<annotations>
13+
<description>Clicks on config nav item selected by passed argument.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="navItem" type="string"/>
17+
</arguments>
18+
19+
<scrollTo stepKey="scrollToNavItem" selector="{{AdminConfigSection.navItemByTitle(navItem)}}" y="-80"/>
20+
<click selector="{{AdminConfigSection.navItemByTitle(navItem)}}" stepKey="openNavItem" />
21+
<waitForElement selector="{{AdminConfigSection.activeNavItemByTitle(navItem)}}" stepKey="waitActiveNavItem" />
22+
<waitForPageLoad stepKey="waitForPageLoad" />
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigDeveloperPageActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenStoreConfigDeveloperPageActionGroup">
12+
<annotations>
13+
<description>Go to admin store configuration developer page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminConfigDeveloperPage.url}}" stepKey="openAdminStoreConfigDeveloperPage" />
17+
<waitForPageLoad stepKey="waitForPageLoad" />
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenStoreConfigPageActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminOpenStoreConfigPageActionGroup">
12+
<annotations>
13+
<description>Go to admin store configuration page.</description>
14+
</annotations>
15+
16+
<amOnPage url="{{AdminConfigPage.url}}" stepKey="openAdminStoreConfigPage" />
17+
<waitForPageLoad stepKey="waitForPageLoad" />
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/GeneralConfigurationActionGroup.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
<amOnPage url="{{AdminConfigGeneralPage.url}}" stepKey="navigateToConfigGeneralPage"/>
2828
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
2929
</actionGroup>
30-
31-
<actionGroup name="NavigateToConfigurationDeveloperPage">
32-
<amOnPage url="{{AdminConfigDeveloperPage.url}}" stepKey="navigateToConfigDeveloperPage"/>
33-
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
34-
</actionGroup>
35-
3630
<actionGroup name="SelectTopDestinationsCountry">
3731
<annotations>
3832
<description>Selects the provided Countries under 'Top destinations' on the 'General' section of the 'Configuration' page. Clicks on the Save button.</description>

‎app/code/Magento/Config/Test/Mftf/Page/AdminConfigPage.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@
2121
<page name="AdminConfigGeneralPage" url="admin/system_config/edit/section/general/" area="admin" module="Magento_Config">
2222
<section name="GeneralSection"/>
2323
</page>
24-
<page name="AdminConfigDeveloperPage" url="admin/system_config/edit/section/dev/" area="admin" module="Magento_Config"/>
24+
<page name="AdminConfigDeveloperPage" url="admin/system_config/edit/section/dev/" area="admin" module="Magento_Config">
25+
<section name="AdminConfigSection" />
26+
</page>
2527
</pages>

‎app/code/Magento/Config/Test/Mftf/Section/AdminConfigSection.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="AdminConfigSection">
10+
<element name="collapsibleTabByTitle" type="button" selector="//div[@id='system_config_tabs']//div[@data-role='title'][contains(.,'{{tabTitle}}')]" parameterized="true" />
11+
<element name="expandedTabByTitle" type="button" selector="//div[@id='system_config_tabs']//div[@data-role='title'][@aria-expanded='true'][contains(.,'{{tabTitle}}')]" parameterized="true" />
12+
<element name="notExpandedTabByTitle" type="button" selector="//div[@id='system_config_tabs']//div[@data-role='title'][@aria-expanded='false'][contains(.,'{{tabTitle}}')]" parameterized="true" />
13+
<element name="navItemByTitle" type="button" selector="//div[@id='system_config_tabs']//div[@role='tablist']//li[contains(@class, 'nav-item')][contains(.,'{{navItem}}')]" parameterized="true" />
14+
<element name="activeNavItemByTitle" type="button" selector="//div[@id='system_config_tabs']//div[@role='tablist']//li[contains(@class, 'nav-item')][contains(@class, '_active')][contains(.,'{{navItem}}')]" parameterized="true" />
1015
<element name="saveButton" type="button" selector="#save"/>
1116
<element name="generalTab" type="text" selector="//div[@class='admin__page-nav-title title _collapsible']//strong[text()='General']"/>
1217
<element name="generalTabClosed" type="text" selector="//div[@class='admin__page-nav-title title _collapsible' and @aria-expanded='false' or @aria-expanded='0']//strong[text()='General']"/>

‎app/code/Magento/Deploy/Test/Mftf/Suite/MagentoDeveloperModeOnlyTestSuite.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+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="MagentoDeveloperModeOnlyTestSuite">
10+
<before>
11+
<magentoCLI command="deploy:mode:set developer" stepKey="enableDeveloperMode"/>
12+
</before>
13+
<include>
14+
<group name="developer_mode_only"/>
15+
</include>
16+
<after>
17+
<!-- Command should be uncommented once MQE-1711 is resolved -->
18+
<comment userInput="Command should be uncommented once MQE-1711 is resolved" stepKey="comment" />
19+
<!-- <magentoCLI command="deploy:mode:set production" stepKey="enableProductionMode"/> -->
20+
</after>
21+
</suite>
22+
</suites>

0 commit comments

Comments
 (0)