Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 1cd00e9

Browse files
committed
MQE-727: MSI Test Cases
- Removing the MultiSourceInventory directory. Moved it to the Inventory directory under the MSI repo. - Adding config metadata. - Redid the Admin Grid selectors.
1 parent 58995c2 commit 1cd00e9

14 files changed

+59
-565
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Section/AdminGridControlsSection.xml

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,52 +8,55 @@
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminGridHeader">
12+
<element name="title" type="text" selector=".page-title-wrapper h1"/>
13+
</section>
14+
<!-- TODO: Search, Notifications, Admin Menu -->
15+
<section name="AdminGridMainControls">
16+
<element name="add" type="button" selector="#add" timeout="30"/>
17+
<element name="back" type="button" selector="#back" timeout="30"/>
18+
<element name="reset" type="button" selector="#reset" timeout="30"/>
19+
<element name="save" type="button" selector="#save-button" timeout="30"/>
20+
<element name="saveAndContinue" type="button" selector="#save-button" timeout="30"/>
21+
<element name="saveArrow" type="button" selector="button[data-ui-id='save-button-dropdown']" timeout="5"/>
22+
<element name="saveAndClose" type="button" selector="span[title='Save &amp; Close']" timeout="30"/>
23+
<element name="saveAndNew" type="button" selector="span[title='Save &amp; New']" timeout="30"/>
24+
</section>
25+
<section name="AdminGridSearchBox">
26+
<element name="searchByKeyword" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword']"/>
27+
<element name="search" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword'] + .action-submit" timeout="30"/>
28+
</section>
1129
<section name="AdminGridFilterControls">
12-
<element name="filters" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] button[data-action='grid-filter-expand']"/>
30+
<element name="filters" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] button[data-action='grid-filter-expand']" timeout="5"/>
1331
<element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
14-
15-
<!-- Manage Sources Filters -->
16-
<element name="code" type="input" selector=".admin__data-grid-filters-wrap input[name='source_code']"/>
17-
<element name="name" type="input" selector=".admin__data-grid-filters-wrap input[name='name']"/>
18-
<element name="priority" type="input" selector=".admin__data-grid-filters-wrap input[name='priority']"/>
32+
<element name="cancel" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
1933
</section>
34+
<!-- TODO: "Default View" drop down menu -->
2035
<section name="AdminGridColumnsControls">
2136
<element name="columns" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-action-columns"/>
2237

23-
<!-- Manage Sources Column Names -->
24-
<element name="code" type="text" selector="//label[contains(text(), 'Code')]"/>
25-
<element name="isEnabled" type="text" selector="//label[contains(text(), 'Is Enabled')]"/>
26-
<element name="longitude" type="text" selector="//label[contains(text(), 'Longitude')]"/>
27-
<element name="stateProvince" type="text" selector="(//label[contains(text(), 'StateProvince')])[1]"/>
28-
<element name="postcode" type="text" selector="//label[contains(text(), 'Postcode')]"/>
29-
<element name="priority" type="text" selector="//label[contains(text(), 'Priority')]"/>
30-
<element name="name" type="text" selector="//label[contains(text(), 'Name')]"/>
31-
<element name="email" type="text" selector="//label[contains(text(), 'Email')]"/>
32-
<element name="country" type="text" selector="//label[contains(text(), 'Country')]"/>
33-
<element name="city" type="text" selector="//label[contains(text(), 'City')]"/>
34-
<element name="phone" type="text" selector="//label[contains(text(), 'Phone')]"/>
35-
<element name="action" type="text" selector="//label[contains(text(), 'Action')]"/>
36-
<element name="contactName" type="text" selector="//label[contains(text(), 'Contact Name')]"/>
37-
<element name="latitude" type="text" selector="//label[contains(text(), 'Latitude')]"/>
38-
<element name="stateProvince" type="text" selector="(//label[contains(text(), 'StateProvince')])[2]"/>
39-
<element name="street" type="text" selector="//label[contains(text(), 'Street')]"/>
40-
<element name="fax" type="text" selector="//label[contains(text(), 'Fax')]"/>
41-
</section>
42-
<section name="AdminGridSearchBox">
43-
<element name="searchByKeyword" type="input" selector="#fulltext"/>
44-
<element name="search" type="button" selector="#fulltext + .action-submit"/>
38+
<element name="columnName" type="button" selector="//label[contains(text(), '{{var1}}')]" parameterized="true" timeout="1"/>
39+
40+
<element name="reset" type="button" selector="//div[@class='admin__action-dropdown-menu-footer']/div/button[contains(text(), 'Reset')]" timeout="5"/>
41+
<element name="cancel" type="button" selector="//div[@class='admin__action-dropdown-menu-footer']/div/button[contains(text(), 'Cancel')]" timeout="5"/>
4542
</section>
46-
<section name="AdminActionsMenu">
43+
<section name="AdminGridActionsMenu">
4744
<element name="dropDown" type="select" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-select" timeout="30"/>
4845
</section>
4946
<section name="AdminGridRowsPerPage">
5047
<element name="count" type="select" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .selectmenu-value input" timeout="30"/>
5148
</section>
52-
<section name="AdminGrid">
53-
<element name="rowByIndex" type="text" selector="tr[data-repeat-index='{{var1}}']" parameterized="true"/>
49+
<!-- TODO: Pagination controls -->
50+
<section name="AdminGridHeaders">
51+
<element name="headerByName" type="text" selector="//span[@class='data-grid-cell-content' and contains(text(), '{{var1}}')]/parent::*" parameterized="true"/>
52+
</section>
53+
<section name="AdminGridRow">
5454
<element name="rowOne" type="text" selector="tr[data-repeat-index='0']"/>
55+
<element name="rowByIndex" type="text" selector="tr[data-repeat-index='{{var1}}']" parameterized="true"/>
56+
57+
<element name="editByValue" type="button" selector="//div[@class='data-grid-cell-content'][contains(text(), '{{var1}}')]/parent::*/parent::*/*/a" parameterized="true"/>
5558

5659
<element name="checkboxByValue" type="checkbox" selector="//div[@class='data-grid-cell-content'][contains(text(), '{{var1}}')]/parent::*/parent::*/*/*/input" parameterized="true"/>
57-
<element name="checkboxes" type="checkbox" selector=".data-row .admin__control-checkbox"/>
60+
<element name="checkboxByIndex" type="checkbox" selector=".data-row[data-repeat-index='{{var1}}'] .admin__control-checkbox" parameterized="true"/>
5861
</section>
5962
</sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductGridSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@
2323
<element name="bulkActionDropdown" type="button" selector="div.admin__data-grid-header-row.row div.action-select-wrap button.action-select"/>
2424
<element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
2525
</section>
26+
<section name="AdminProductGridFilterControls">
27+
<element name="sku" type="input" selector=".admin__data-grid-filters-wrap input[name='sku']"/>
28+
</section>
2629
</sections>
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
11+
<operation name="UpdateCmsConfiguration" dataType="config_state" type="update"
12+
auth="adminOauth" url="" method="">
13+
<contentType>application/json</contentType>
14+
<object dataType="config_state" key="config_state">
15+
<field key="cms_wysiwyg">1</field>
16+
</object>
17+
<object dataType="groups">
18+
19+
</object>
20+
</operation>
21+
</operations>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MultiSourceInventory/Data/MsiProductData.xml

Lines changed: 0 additions & 21 deletions
This file was deleted.

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MultiSourceInventory/Data/MsiSourceData.xml

Lines changed: 0 additions & 83 deletions
This file was deleted.

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MultiSourceInventory/Metadata/source-meta.xml

Lines changed: 0 additions & 37 deletions
This file was deleted.

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MultiSourceInventory/Page/AdminManageSourcesPage.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MultiSourceInventory/Section/AdminManageSourcesGridSection.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/MultiSourceInventory/Section/AdminManageSourcesSection.xml

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)