Skip to content

Commit 76fbe59

Browse files
danmooney2danmooney2
committed
Merge remote-tracking branch 'remotes/origin/MAGETWO-91240' into team3-delivery
2 parents d6011f4 + 040ab11 commit 76fbe59

File tree

5 files changed

+59
-6
lines changed

5 files changed

+59
-6
lines changed

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Data/ProductData.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,19 @@
7777
<data key="quantity">1000</data>
7878
<data key="urlKey" unique="suffix">simple</data>
7979
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
80+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
81+
</entity>
82+
<entity name="SimpleProduct4" type="product">
83+
<data key="sku" unique="suffix">testSku</data>
84+
<data key="type_id">simple</data>
85+
<data key="attribute_set_id">4</data>
86+
<data key="visibility">4</data>
87+
<data key="name" unique="suffix">OutOfStockProduct</data>
88+
<data key="price">123.00</data>
89+
<data key="urlKey" unique="suffix">testurlkey</data>
90+
<data key="status">1</data>
91+
<data key="quantity">0</data>
92+
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
8093
</entity>
8194
<entity name="NewSimpleProduct" type="product">
8295
<data key="price">321.00</data>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/DisplayOutOfStockProductActionGroup.xml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="displayOutOfStockProduct">
12+
<amOnPage url="{{InventoryConfigurationPage.url}}" stepKey="navigateToInventoryConfigurationPage"/>
13+
<waitForPageLoad stepKey="waitForConfigPageToLoad"/>
14+
<uncheckOption selector="{{InventoryConfigSection.DisplayOutOfStockSystemValue}}" stepKey="uncheckUseSystemValue"/>
15+
<waitForElementVisible selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" stepKey="waitForSwitcherDropdown" />
16+
<selectOption selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" userInput="Yes" stepKey="switchToYes" />
17+
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
18+
</actionGroup>
19+
<actionGroup name="noDisplayOutOfStockProduct">
20+
<amOnPage url="{{InventoryConfigurationPage.url}}" stepKey="navigateToInventoryConfigurationPage"/>
21+
<waitForPageLoad stepKey="waitForConfigPageToLoad"/>
22+
<uncheckOption selector="{{InventoryConfigSection.DisplayOutOfStockSystemValue}}" stepKey="uncheckUseSystemValue"/>
23+
<waitForElementVisible selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" stepKey="waitForSwitcherDropdown" />
24+
<selectOption selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" userInput="No" stepKey="switchToNo" />
25+
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
26+
</actionGroup>
27+
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/ActionGroup/SwitcherActionGroup.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
<actionGroup name="SwitchToVersion4ActionGroup">
1212
<amOnPage url="{{ConfigurationStoresPage.url}}" stepKey="navigateToWYSIWYGConfigPage1"/>
1313
<waitForPageLoad stepKey="waitForConfigPageToLoad"/>
14-
<conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" />
15-
<waitForElementVisible selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="waitForCheckbox" />
16-
<uncheckOption selector="{{ContentManagementSection.SwitcherSystemValue}}" stepKey="uncheckUseSystemValue"/>
17-
<waitForElementVisible selector="{{ContentManagementSection.Switcher}}" stepKey="waitForSwitcherDropdown" />
18-
<selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 4" stepKey="switchToVersion4" />
19-
<click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions" />
14+
<uncheckOption selector="{{InventoryConfigSection.DisplayOutOfStockSystemValue}}" stepKey="uncheckUseSystemValue"/>
15+
<waitForElementVisible selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" stepKey="waitForDropdown" />
16+
<selectOption selector="{{InventoryConfigSection.DisplayOutOfStockDropdown}}" userInput="Yes" stepKey="switchToYes" />
2017
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
2118
</actionGroup>
2219
</actionGroups>

‎dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Config/Page/AdminConfigPage.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
<page name="AdminContentManagementPage" url="admin/system_config/edit/section/cms/" area="admin" module="Magento_Config">
1313
<section name="ContentManagementSection"/>
1414
</page>
15+
<page name="InventoryConfigurationPage" url="admin/system_config/edit/section/cataloginventory/" area="admin" module="Magento_Config">
16+
<section name="InventorySection"/>
17+
</page>
1518
</pages>

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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+
<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="InventoryConfigSection">
10+
<element name="DisplayOutOfStockSystemValue" type="button" selector="#cataloginventory_options_show_out_of_stock_inherit"/>
11+
<element name="DisplayOutOfStockDropdown" type="button" selector="#cataloginventory_options_show_out_of_stock"/>
12+
</section>
13+
</sections>

0 commit comments

Comments
 (0)