Skip to content

Commit fb16460

Browse files
okolesnykokolesnyk
committed
Merge branch 'community-tests-migration-pr' of github.com:magento-pangolin/magento2ce into 2.3-develop-fast-lane-prs
2 parents 82a58c2 + ef8c8df commit fb16460

File tree

9 files changed

+87
-5
lines changed

9 files changed

+87
-5
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="NotLoggedInCustomerGroup" type="customerGroup">
12+
<data key="id">0</data>
13+
<data key="code">NOT LOGGED IN</data>
14+
<data key="tax_class_id">3</data>
15+
<data key="tax_class_name">Retail Customer</data>
16+
</entity>
1117
<entity name="GeneralCustomerGroup" type="customerGroup">
1218
<data key="code">General</data>
1319
<data key="tax_class_id">3</data>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<element name="selectFirstRow" type="button" selector="//button[@class='action-select']"/>
1616
<element name="deleteBtn" type="button" selector="//*[text()='Delete']"/>
1717
<element name="clearAllBtn" type="button" selector="//button[text()='Clear all']"/>
18+
<element name="editButtonByCustomerGroupCode" type="button" selector="//tr[.//td[count(//th[./*[.='Group']]/preceding-sibling::th) + 1][./*[.='{{code}}']]]//a[contains(@href, '/edit/')]" parameterized="true" />
1819
</section>
1920
</sections>

‎app/code/Magento/Customer/Test/Mftf/Test/VerifyDisabledCustomerGroupFieldTest.xml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="VerifyDisabledCustomerGroupFieldTest">
12+
<annotations>
13+
<stories value="Check that field is disabled in system Customer Group"/>
14+
<title value="Check that field is disabled in system Customer Group"/>
15+
<description value="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group"/>
16+
<testCaseId value="MC-14206"/>
17+
<severity value="CRITICAL"/>
18+
<group value="customers"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
22+
<!-- Steps -->
23+
<!-- 1. Login to backend as admin user -->
24+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
<waitForPageLoad stepKey="waitForAdminPageLoad" />
26+
27+
<!-- 2. Navigate to Customers > Customer Groups -->
28+
<amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="amOnCustomerGroupPage" />
29+
<waitForPageLoad stepKey="waitForCustomerGroupsPageLoad" />
30+
31+
<!-- 3. Select system Customer Group specified in data set from grid -->
32+
<click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />
33+
34+
<!-- 4. Perform all assertions -->
35+
<seeInField selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="{{NotLoggedInCustomerGroup.code}}" stepKey="seeNotLoggedInTextInGroupName" />
36+
<assertElementContainsAttribute selector="{{AdminNewCustomerGroupSection.groupName}}" attribute="disabled" expectedValue="true" stepKey="checkIfGroupNameIsDisabled" />
37+
</test>
38+
</tests>

‎app/code/Magento/PageCache/Test/Mftf/Section/AdminCacheManagementSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,6 @@
3030
<element name="pageCacheCheckbox" type="checkbox" selector="input[value='full_page']"/>
3131
<element name="webServicesConfigCheckbox" type="checkbox" selector="input[value='config_webservice']"/>
3232
<element name="translationsCheckbox" type="checkbox" selector="input[value='translate']"/>
33+
<element name="additionalCacheButton" type="button" selector="//*[@id='container']//button[contains(., '{{cacheType}}')]" parameterized="true" />
3334
</section>
3435
</sections>

‎app/code/Magento/PageCache/Test/Mftf/Test/FlushStaticFilesCacheButtonVisibilityTest.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="FlushStaticFilesCacheButtonVisibilityTest">
12+
<annotations>
13+
<features value="PageCache"/>
14+
<stories value="Page Cache"/>
15+
<title value="Check visibility of flush static files cache button"/>
16+
<description value="Flush Static Files Cache button visibility"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-15454"/>
19+
<group value="production_mode_only"/>
20+
<group value="pagecache"/>
21+
<group value="mtf_migrated"/>
22+
</annotations>
23+
<before>
24+
<!-- Log in to Admin Panel -->
25+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
26+
</before>
27+
28+
<!-- Open Cache Management page -->
29+
<amOnPage url="{{AdminCacheManagementPage.url}}" stepKey="amOnPageCacheManagement"/>
30+
<waitForPageLoad stepKey="waitForPageCacheManagementLoad"/>
31+
32+
<!-- Check 'Flush Static Files Cache' not visible in production mode. -->
33+
<dontSee selector="{{AdminCacheManagementSection.additionalCacheButton('Flush Static Files Cache')}}" stepKey="dontSeeFlushStaticFilesButton" />
34+
</test>
35+
</tests>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderStatusFormFillAndSaveActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<!-- Fill Order status form and click save -->
1212
<actionGroup name="AdminOrderStatusFormFillAndSave">
1313
<arguments>
14-
<argument name="status" type="string" defaultValue=""/>
15-
<argument name="label" type="string" defaultValue=""/>
14+
<argument name="status" type="string" />
15+
<argument name="label" type="string" />
1616
</arguments>
1717

1818
<fillField stepKey="fillStatusCode" selector="{{AdminOrderStatusFormSection.statusCodeField}}" userInput="{{status}}"/>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertOrderStatusExistsInGridActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<!-- Search order status grid for item with a specific code and validate data -->
1212
<actionGroup name="AssertOrderStatusExistsInGrid">
1313
<arguments>
14-
<argument name="status" type="string" defaultValue=""/>
15-
<argument name="label" type="string" defaultValue=""/>
14+
<argument name="status" type="string" />
15+
<argument name="label" type="string" />
1616
</arguments>
1717

1818
<click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>

‎dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Customer\Test\TestCase\VerifyDisabledCustomerGroupFieldTest" summary="Check that field is disabled in system Customer Group" ticketId="MAGETWO-52481">
1010
<variation name="VerifyDisabledCustomerGroupField1" summary="Checks that customer_group_code field is disabled in NOT LOGGED IN Customer Group">
11+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1112
<data name="customerGroup/dataset" xsi:type="string">NOT_LOGGED_IN</data>
1213
<data name="disabledFields" xsi:type="array">
1314
<item name="0" xsi:type="string">customer_group_code</item>

‎dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\PageCache\Test\TestCase\FlushStaticFilesCacheButtonVisibilityTest" summary="Flush Static Files Cache button visibility" ticketId="MAGETWO-39934">
1010
<variation name="FlushStaticFilesCacheButtonVisibilityTest">
11-
<data name="tag" xsi:type="string">severity:S3</data>
11+
<data name="tag" xsi:type="string">severity:S3, mftf_migrated:yes</data>
1212
<constraint name="Magento\PageCache\Test\Constraint\AssertFlushStaticFilesCacheButtonVisibility" />
1313
</variation>
1414
</testCase>

0 commit comments

Comments
 (0)