Skip to content

Commit 44e3ce2

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MAGETWO-90317' into 2.3-develop-pr14
2 parents c1e1fbe + feaa32c commit 44e3ce2

12 files changed

+63
-18
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCompareActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<argument name="productVar"/>
5353
</arguments>
5454
<seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName(productVar.name)}}" stepKey="assertProductName"/>
55-
<see userInput="${{productVar.price}}.00" selector="{{StorefrontProductCompareMainSection.ProductPriceByName(productVar.name)}}" stepKey="assertProductPrice"/>
56-
<see userInput="{{productVar.sku}}" selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName('SKU', productVar.name)}}" stepKey="assertProductPrice"/>
55+
<see userInput="${{productVar.price}}.00" selector="{{StorefrontProductCompareMainSection.ProductPriceByName(productVar.name)}}" stepKey="assertProductPrice1"/>
56+
<see userInput="{{productVar.sku}}" selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName('SKU', productVar.name)}}" stepKey="assertProductPrice2"/>
5757
<!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
5858
<seeElement selector="{{StorefrontProductCompareMainSection.ProductAddToCartByName(productVar.name)}}" stepKey="assertProductAddToCart"/>
5959
</actionGroup>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/CatalogSearch/ActionGroup/StorefrontCatalogSearchActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<actionGroup name="StorefrontOpenAdvancedSearchActionGroup">
2525
<click selector="{{StorefrontFooterSection.AdvancedSearch}}" stepKey="clickAdvancedSearchLink" />
2626
<seeInCurrentUrl url="{{StorefrontCatalogSearchAdvancedFormPage.url}}" stepKey="checkUrl"/>
27-
<seeInTitle userInput="Advanced Search" stepKey="assertAdvancedSearchTitle"/>
28-
<see userInput="Advanced Search" selector="{{StorefrontCatalogSearchAdvancedFormSection.SearchTitle}}" stepKey="assertAdvancedSearchTitle"/>
27+
<seeInTitle userInput="Advanced Search" stepKey="assertAdvancedSearchTitle1"/>
28+
<see userInput="Advanced Search" selector="{{StorefrontCatalogSearchAdvancedFormSection.SearchTitle}}" stepKey="assertAdvancedSearchTitle2"/>
2929
</actionGroup>
3030

3131
<!-- Check that Advanced Search result page contains correct information -->

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Section/StoreConfigSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
<element name="CheckIfTabExpand" type="button" selector="#general_store_information-head:not(.open)"/>
1313
<element name="StoreInformation" type="button" selector="#general_store_information-head"/>
1414
<element name="City" type="input" selector="#general_store_information_city"/>
15-
<element name="Save" type="button" selector="#save"/>
15+
<element name="Save" type="button" selector="#save" timeout="30"/>
1616
</section>
1717
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/ActionGroup/StorefrontCompareActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<argument name="optionProduct"/>
1616
</arguments>
1717
<seeElement selector="{{StorefrontProductCompareMainSection.ProductLinkByName(product.name)}}" stepKey="assertProductName"/>
18-
<see userInput="${{optionProduct.price}}.00" selector="{{StorefrontProductCompareMainSection.ProductPriceByName(product.name)}}" stepKey="assertProductPrice"/>
19-
<see userInput="{{product.sku}}" selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName('SKU', product.name)}}" stepKey="assertProductPrice"/>
18+
<see userInput="${{optionProduct.price}}.00" selector="{{StorefrontProductCompareMainSection.ProductPriceByName(product.name)}}" stepKey="assertProductPrice1"/>
19+
<see userInput="{{product.sku}}" selector="{{StorefrontProductCompareMainSection.ProductAttributeByCodeAndProductName('SKU', product.name)}}" stepKey="assertProductPrice2"/>
2020
<!-- @TODO: MAGETWO-80272 Move to Magento_Checkout -->
2121
<seeElement selector="{{StorefrontProductCompareMainSection.ProductAddToCartByName(product.name)}}" stepKey="assertProductAddToCart"/>
2222
</actionGroup>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminCreateProductConfigurationsPanelSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<element name="attributeCode" type="input" selector=".admin__control-text[name='attribute_code']"/>
1616
<element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
1717
<element name="firstCheckbox" type="input" selector="tr[data-repeat-index='0'] .admin__control-checkbox"/>
18+
<element name="id" type="text" selector="//tr[contains(@data-repeat-index, '0')]/td[2]/div"/>
1819

1920
<element name="selectAll" type="button" selector=".action-select-all"/>
2021
<element name="createNewValue" type="input" selector=".action-create-new" timeout="30"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Section/AdminProductFormConfigurationsSection.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,21 @@
1717
<element name="currentVariationsQuantityCells" type="textarea" selector=".admin__control-fields[data-index='quantity_container']"/>
1818
<element name="currentVariationsAttributesCells" type="textarea" selector=".admin__control-fields[data-index='attributes']"/>
1919
</section>
20+
<section name="AdminConfigurableProductFormSection">
21+
<element name="productWeight" type="input" selector=".admin__control-text[name='product[weight]']"/>
22+
<element name="productQuantity" type="input" selector=".admin__control-text[name='product[quantity_and_stock_status][qty]']"/>
23+
<element name="currentVariationsQuantityCells" type="button" selector="td[data-index='quantity_per_source_container']"/>
24+
<element name="rowByCode" type="textarea" selector="//span[contains(text(), '{{var1}}-{{var2}}')]//ancestor-or-self::tr" parameterized="true"/>
25+
</section>
26+
<section name="AdminConfigurableProductSelectAttributesSlideOut">
27+
<element name="grid" type="button" selector=".admin__data-grid-wrap tbody"/>
28+
</section>
29+
<section name="AdminConfigurableProductAssignSourcesSlideOut">
30+
<element name="done" type="button" selector=".product_form_product_form_assign_sources_configurable_modal .action-primary" timeout="5"/>
31+
<element name="assignSources" type="button" selector="(//button/span[contains(text(), 'Assign Sources')])[2]" timeout="5"/>
32+
<element name="quantityPerSource" type="input" selector="input[name='quantity_resolver[dynamicRows][dynamicRows][0][quantity_per_source]']"/>
33+
</section>
34+
<section name="StorefrontConfigurableProductPage">
35+
<element name="productAttributeDropDown" type="select" selector="select[id*='attribute']"/>
36+
</section>
2037
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewStoreGroupSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
99
<section name="AdminNewStoreGroupSection">
10+
<element name="storeGrpWebsiteDropdown" type="select" selector="#group_website_id"/>
1011
<element name="storeGrpNameTextField" type="input" selector="#group_name"/>
1112
<element name="storeGrpCodeTextField" type="input" selector="#group_code"/>
1213
<element name="storeRootCategoryDropdown" type="button" selector="#group_root_category_id"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminNewWebsiteSection.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminNewWebsiteSection">
12+
<element name="name" type="input" selector="#website_name"/>
13+
<element name="code" type="input" selector="#website_code"/>
14+
</section>
15+
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresGridSection.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
9+
<section name="AdminStoresGridControlsSection">
10+
<element name="createStoreView" type="button" selector="#add_store"/>
11+
<element name="createStore" type="button" selector="#add_group"/>
12+
<element name="createWebsite" type="button" selector="#add"/>
13+
</section>
914
<section name="AdminStoresGridSection">
1015
<element name="storeGrpFilterTextField" type="input" selector="#storeGrid_filter_group_title"/>
1116
<element name="websiteFilterTextField" type="input" selector="#storeGrid_filter_website_title"/>
@@ -15,6 +20,6 @@
1520
<element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>
1621
<element name="storeGrpNameInFirstRow" type="text" selector=".col-group_title>a"/>
1722
<element name="storeNameInFirstRow" type="text" selector=".col-store_title>a"/>
18-
19-
</section>
23+
<element name="firstRow" type="textarea" selector="(//*[@id='storeGrid_table']/tbody/tr)[1]"/>
24+
</section>
2025
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
99
<section name="AdminStoresMainActionsSection">
10-
<element name="createStoreViewButton" type="button" selector="#add_store"/>
11-
<element name="createStoreButton" type="button" selector="#add_group"/>
12-
<element name="createWebsiteButton" type="button" selector="#add"/>
13-
<element name="saveButton" type="button" selector="#save"/>
14-
<element name="backButton" type="button" selector="#back"/>
10+
<element name="createStoreViewButton" type="button" selector="#add_store" timeout="30"/>
11+
<element name="createStoreButton" type="button" selector="#add_group" timeout="30"/>
12+
<element name="createWebsiteButton" type="button" selector="#add" timeout="30"/>
13+
<element name="saveButton" type="button" selector="#save" timeout="30"/>
14+
<element name="backButton" type="button" selector="#back" timeout="30"/>
1515
<element name="deleteButton" type="button" selector="#delete" timeout="30"/>
1616
</section>
1717
</sections>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</arguments>
1616

1717
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
18-
<waitForPageLoad stepKey="waitForPageLoad" time="5"/>
1918

2019
<fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
2120
<click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch"/>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,24 @@
2929
<element name="cancel" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
3030
<element name="clearAll" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] button[data-action='grid-filter-reset']" timeout="5"/>
3131
</section>
32-
<!-- TODO: "Default View" drop down menu -->
32+
<section name="AdminGridDefaultViewControls">
33+
<element name="defaultView" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-action-bookmarks" timeout="5"/>
34+
<element name="viewByName" type="button" selector="//a[@class='action-dropdown-menu-link'][contains(text(), '{{var1}}')]" parameterized="true" timeout="5"/>
35+
<element name="saveViewAs" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-dropdown-menu-item-last a" timeout="5"/>
36+
<element name="viewName" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] ._edit input"/>
37+
<element name="save" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] ._edit button" timeout="30"/>
38+
</section>
3339
<section name="AdminGridColumnsControls">
34-
<element name="columns" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-action-columns"/>
40+
<element name="columns" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-action-columns" timeout="5"/>
3541

36-
<element name="columnName" type="button" selector="//label[contains(text(), '{{var1}}')]" parameterized="true" timeout="1"/>
42+
<element name="columnName" type="button" selector="//label[contains(text(), '{{var1}}')]" parameterized="true" timeout="5"/>
3743

3844
<element name="reset" type="button" selector="//div[@class='admin__action-dropdown-menu-footer']/div/button[contains(text(), 'Reset')]" timeout="5"/>
3945
<element name="cancel" type="button" selector="//div[@class='admin__action-dropdown-menu-footer']/div/button[contains(text(), 'Cancel')]" timeout="5"/>
4046
</section>
4147
<section name="AdminGridActionsMenu">
4248
<element name="dropDown" type="select" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-select" timeout="30"/>
49+
<element name="delete" type="select" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-menu-items li" timeout="5"/>
4350
</section>
4451
<section name="AdminGridRowsPerPage">
4552
<element name="count" type="select" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .selectmenu-value input" timeout="30"/>

0 commit comments

Comments
 (0)