Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add "Admin" prefix to Test and ActionGroup #27276

Merged
merged 3 commits into from
Mar 25, 2020
Merged

Add "Admin" prefix to Test and ActionGroup #27276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ed4cf7
Add "Admin" prefix to Test and ActionGroup
lbajsarowicz Mar 13, 2020
9d78f60
Add missing copyright
lbajsarowicz Mar 13, 2020
fa4ac9b
Merge remote-tracking branch 'origin/2.4-develop' into mftf/add-prefix
lbajsarowicz Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...de/Magento/Customer/Test/Mftf/ActionGroup/AdminGridCustomerGroupEditByCodeActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
-->

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminGridCustomerGroupEditByCodeActionGroup">
<arguments>
<argument name="customerGroupCode" type="string"/>
</arguments>

<click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(customerGroupCode)}}" stepKey="clickOnEditCustomerGroup" />
</actionGroup>
</actionGroups>
2 changes: 1 addition & 1 deletion ...roup/NavigateCustomerGroupActionGroup.xml → ...avigateToCustomerGroupPageActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="NavigateToCustomerGroupPage">
<actionGroup name="AdminNavigateToCustomerGroupPageActionGroup">
<annotations>
<description>Goes to the Admin Customer Groups page.</description>
</annotations>
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Customer/Test/Mftf/ActionGroup/_Deprecated_ActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ NOTICE: Action Groups in this file are DEPRECATED and SHOULD NOT BE USED anymore
-->
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="NavigateToCustomerGroupPage" extends="AdminNavigateToCustomerGroupPageActionGroup" deprecated="Use AdminNavigateToCustomerGroupPageActionGroup"/>
<actionGroup name="AdminCreateCustomerWithWebSiteAndGroup" deprecated="Use `AdminCreateCustomerWithWebSiteAndGroupActionGroup` instead">
<annotations>
<description>Goes to the Customer grid page. Click on 'Add New Customer'. Fills provided Customer Data. Fill provided Customer Address data. Assigns Product to Website and Store View. Clicks on Save.</description>
Expand Down
22 changes: 11 additions & 11 deletions .../VerifyDisabledCustomerGroupFieldTest.xml → ...nVerifyDisabledCustomerGroupFieldTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="VerifyDisabledCustomerGroupFieldTest">
<test name="AdminVerifyDisabledCustomerGroupFieldTest">
<annotations>
<stories value="Check that field is disabled in system Customer Group"/>
<title value="Check that field is disabled in system Customer Group"/>
Expand All @@ -19,20 +19,20 @@
<group value="mtf_migrated"/>
</annotations>

<!-- Steps -->
<!-- 1. Login to backend as admin user -->
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
<waitForPageLoad stepKey="waitForAdminPageLoad" />
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

<!-- 2. Navigate to Customers > Customer Groups -->
<amOnPage url="{{AdminCustomerGroupPage.url}}" stepKey="amOnCustomerGroupPage" />
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearFiltersIfTheySet"/>
<actionGroup ref="AdminNavigateToCustomerGroupPageActionGroup" stepKey="amOnCustomerGroupPage"/>
<actionGroup ref="AdminFilterCustomerGroupByNameActionGroup" stepKey="clearFiltersIfTheySet">
<argument name="customerGroupName" value="{{NotLoggedInCustomerGroup.code}}"/>
</actionGroup>

<!-- 3. Select system Customer Group specified in data set from grid -->
<click selector="{{AdminCustomerGroupMainSection.editButtonByCustomerGroupCode(NotLoggedInCustomerGroup.code)}}" stepKey="clickOnEditCustomerGroup" />
<actionGroup ref="AdminGridCustomerGroupEditByCodeActionGroup" stepKey="openCustomerGroup">
<argument name="customerGroupCode" value="{{NotLoggedInCustomerGroup.code}}"/>
</actionGroup>

<!-- 4. Perform all assertions -->
<seeInField selector="{{AdminNewCustomerGroupSection.groupName}}" userInput="{{NotLoggedInCustomerGroup.code}}" stepKey="seeNotLoggedInTextInGroupName" />
<assertElementContainsAttribute selector="{{AdminNewCustomerGroupSection.groupName}}" attribute="disabled" expectedValue="true" stepKey="checkIfGroupNameIsDisabled" />

<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
</test>
</tests>
1 change: 1 addition & 0 deletions app/code/Magento/Customer/Test/Mftf/Test/_Deprecated_Test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
-->

<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="VerifyDisabledCustomerGroupFieldTest" extends="AdminVerifyDisabledCustomerGroupFieldTest" deprecated="Use AdminVerifyDisabledCustomerGroupFieldTest instead"/>
<test name="AddingProductWithExpiredSessionTest" extends="StorefrontAddProductToCartWithExpiredSessionTest" deprecated="Use StorefrontAddProductToCartWithExpiredSessionTest"/>
</tests>