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

magento/partners-magento2b2b#137: Add Company to Customers Now Online… #29170

Merged
merged 5 commits into from
Jul 29, 2020
Merged

magento/partners-magento2b2b#137: Add Company to Customers Now Online… #29170

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f7c8db
magento/partners-magento2b2b#137: Add Company to Customers Now Online…
rsaint20 Jul 16, 2020
091b98d
magento/partners-magento2b2b#137: Add Company to Customers Now Online…
rsaint20 Jul 16, 2020
ae9bace
magento/partners-magento2b2b#137: Add Company to Customers Now Online…
rsaint20 Jul 20, 2020
5fb4d1e
Merge branch '2.4-develop' into 137_Add_Company_to_Customers_Now_Onli…
joanhe Jul 20, 2020
cd0dba2
Merge branch '2.4-develop' into 137_Add_Company_to_Customers_Now_Onli…
joanhe Jul 22, 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
22 changes: 22 additions & 0 deletions ...Customer/Test/Mftf/ActionGroup/AdminAssertCustomerInCustomersNowOnlineGridActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?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">
<!--Assert company in customers now online grid row -->
<actionGroup name="AdminAssertCustomerInCustomersNowOnlineGridActionGroup">
<annotations>
<description>Validates that the provided Customer is present and correct in the Customer now online grid page.</description>
</annotations>
<arguments>
<argument name="text" type="string"/>
<argument name="columnName" type="string"/>
</arguments>
<waitForText selector="{{AdminCustomersNowOnlineGridSection.gridCell('1', columnName)}}" userInput="{{text}}" stepKey="waitForCustomesrNowOnline"/>
</actionGroup>
</actionGroups>
19 changes: 19 additions & 0 deletions ...e/Magento/Customer/Test/Mftf/ActionGroup/AdminNavigateToCustomerOnlinePageActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?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="AdminNavigateToCustomerOnlinePageActionGroup">
<annotations>
<description>Goes to the Admin Customer Online page.</description>
</annotations>

<amOnPage url="{{AdminCustomersNowOnlinePage.url}}" stepKey="openCustomersOnlineGridPage"/>
<waitForPageLoad stepKey="waitForPageLoad"/>
</actionGroup>
</actionGroups>
14 changes: 14 additions & 0 deletions app/code/Magento/Customer/Test/Mftf/Page/AdminCustomersNowOnlinePage.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
<page name="AdminCustomersNowOnlinePage" url="/customer/online/" area="admin" module="Magento_Customer">
<section name="AdminCustomersNowOnlineGridSection"/>
</page>
</pages>
16 changes: 16 additions & 0 deletions app/code/Magento/Customer/Test/Mftf/Section/AdminCustomersNowOnlineGridSection.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->

<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
<section name="AdminCustomersNowOnlineGridSection">
<element name="columnTitle" type="text" selector=".admin__action-dropdown-menu-content label[title='{{column}}']" parameterized="true"/>
<element name="gridCell" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., '{{column}}')]/preceding-sibling::th) +1 ]" parameterized="true"/>
</section>
</sections>

25 changes: 25 additions & 0 deletions app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAddColumnToAdminGridActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?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="AdminAddColumnToAdminGridActionGroup">
<annotations>
<description value="Adds column to admin grid"/>
</annotations>
<arguments>
<argument name="columnName" defaultValue="Email" type="string"/>
</arguments>
<waitForElementVisible selector="{{AdminGridColumnsControls.columns}}" stepKey="waitForAdminGridColumnControlsColumn"/>
<click selector="{{AdminGridColumnsControls.columns}}" stepKey="clickAdminGridColumnControlsColumn"/>
<waitForElementVisible selector="{{AdminDataGridHeaderSection.columnCheckbox(columnName)}}" stepKey="verifyAdminGridColumnControlsForSelectedColumnVisible"/>
<click selector="{{AdminDataGridHeaderSection.columnCheckbox(columnName)}}" stepKey="clickForAdminGridControlForSelectedColumn"/>
<waitForElementVisible selector="{{AdminGridHeaders.headerByName(columnName)}}" stepKey="waitForAdminGridColumnHeaderForSelectedColumn"/>
<click selector="{{AdminGridColumnsControls.columns}}" stepKey="closeAdminGridColumnControls"/>
<waitForElementNotVisible selector="{{AdminGridColumnsControls.columnName(columnName)}}" stepKey="verifyAdminGridColumnControlsForSelectedColumnNotVisible"/>
</actionGroup>
</actionGroups>