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

Commit 29f1282

Browse files
committed
MAGETWO-87709: add related products test.
1 parent 178db2a commit 29f1282

File tree

9 files changed

+24
-28
lines changed

9 files changed

+24
-28
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminProductActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<!--Assert text in Related, Up-Sell or Cross-Sell section in Admin Product page-->
9090
<actionGroup name="AssertTextInAdminProductRelatedUpSellCrossSellSection">
9191
<arguments>
92-
<argument name="element" defaultValue="AdminProductRelatedUpSellCrossSellSection.relatedProductSectionText"/>
92+
<argument name="element" defaultValue="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
9393
<argument name="expectedText"/>
9494
</arguments>
9595
<conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openTab"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductCreatePage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
<section name="AdminProductImagesSection"/>
1616
<section name="AdminAddProductsToOptionPanel"/>
1717
<section name="AdminProductMessagesSection"/>
18+
<section name="AdminProductFormRelatedUpSellCrossSellSection"/>
1819
</page>
1920
</pages>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontCategoryPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Category" parameterized="true">
11+
<page name="StorefrontCategoryPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
1212
<section name="StorefrontCategoryMainSection"/>
1313
<section name="WYSIWYGToolbarSection"/>
1414
</page>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/AdminProductPage.xml renamed to dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Page/StorefrontProductPage.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11-
<page name="AdminProductPage" url="catalog/product/view" area="admin" module="Magento_Catalog">
11+
<page name="StorefrontProductPage" url="/{{var1}}.html" area="storefront" module="Catalog" parameterized="true">
1212
<section name="StorefrontProductInfoMainSection" />
1313
<section name="StorefrontProductInfoDetailsSection" />
1414
<section name="StorefrontProductImageSection" />
1515
<section name="StorefrontMessagesSection" />
16+
<section name="StorefrontProductRelatedProductsSection"/>
1617
</page>
1718
</pages>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<element name="productFormTabState" type="text" selector="//strong[@class='admin__collapsible-title']/span[contains(text(), '{{tabName}}')]/parent::*/parent::*[@data-state-collapsible='{{state}}']" parameterized="true"/>
2424
</section>
2525
<section name="AdminProductFormRelatedUpSellCrossSellSection">
26-
<element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']"/>
26+
<element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
2727
</section>
2828
<section name="AdminAddRelatedProductsModalSection">
2929
<element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_related_related_modal')]//button/span[contains(text(), 'Add Selected Products')]" timeout="30"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
<element name="multicheckOption" type="button" selector="//div[@data-role='grid-wrapper']//th[contains(@class, data-grid-multicheck-cell)]//li//span[text() = '{{label}}']" parameterized="true"/>
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"/>
25-
<element name="productGridXRowYColumnButton" type="input" selector="table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true"/>
25+
<element name="productGridXRowYColumnButton" type="input" selector="table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
2626
</section>
2727
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
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">
1111
<section name="AdminProductModalSlideGridSection">
12-
<element name="productGridXRowYColumnButton" type="input" selector=".modal-slide table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true"/>
12+
<element name="productGridXRowYColumnButton" type="input" selector=".modal-slide table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
1313
</section>
1414
</sections>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
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="AdminProductRelatedUpSellCrossSellSection">
11+
<section name="AdminProductFormRelatedUpSellCrossSellSection">
12+
<element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
1213
<element name="relatedProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='related']"/>
1314
<element name="upSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='upsell']"/>
1415
<element name="crossSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='crosssell']"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminRelatedProductsTest.xml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -92,98 +92,91 @@
9292
<deleteData createDataKey="productAttributeHandle" stepKey="deleteProductAttribute"/>
9393
</after>
9494

95-
<comment userInput="Filter and edit simple product 1" stepKey="Edit1"/>
95+
<comment userInput="Filter and edit simple product 1" stepKey="filterAndEditComment1"/>
9696
<amOnPage url="{{AdminProductIndexPage}}" stepKey="productIndexPage"/>
9797
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
9898
<actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial"/>
9999
<actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimple">
100100
<argument name="product" value="$$simple1Handle$$"/>
101101
</actionGroup>
102102
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
103-
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
104103
<conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openRelatedProductTab"/>
105104
<waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
106105

107106
<!-- TODO: move adding related product to a action group when nested action group is allowed (ref#: MQE-539)-->
108-
<comment userInput="Add related simple product to simple product" stepKey="Add1"/>
107+
<comment userInput="Add related simple product to simple product" stepKey="addSimpleToSimpleComment"/>
109108
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton"/>
110-
<waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
111109
<actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimple1">
112110
<argument name="product" value="$$simple2Handle$$"/>
113111
</actionGroup>
114112
<click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectSimpleTwo"/>
115113
<click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll1"/>
116114
<click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected1"/>
117115

118-
<comment userInput="Add related config product to simple product" stepKey="Add2"/>
116+
<comment userInput="Add related config product to simple product" stepKey="addConfigToSimpleComment"/>
119117
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton2"/>
120-
<waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
121118
<actionGroup ref="filterProductGridBySku" stepKey="filterProductGridSimpleForRelatedConfig1">
122119
<argument name="product" value="$$baseConfigProductHandle$$"/>
123120
</actionGroup>
124121
<click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectConfigProduct"/>
125122
<click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll2"/>
126123
<click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected2"/>
127124

128-
<comment userInput="Save simple product" stepKey="Save1"/>
125+
<comment userInput="Save simple product" stepKey="saveSimpleProductComment"/>
129126
<actionGroup ref="saveProductForm" stepKey="saveRelatedProduct1"/>
130-
<waitForPageLoad time="30" stepKey="waitForPageLoad10"/>
131127

132128
<comment userInput="Assert related simple products for simple product in Admin Product Form" stepKey="assertRelated1Comment"/>
133129
<actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated1">
134-
<argument name="element" value="AdminProductRelatedUpSellCrossSellSection.relatedProductSectionText"/>
130+
<argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
135131
<argument name="expectedText" value="$$simple2Handle.name$$"/>
136132
</actionGroup>
137133

138134
<comment userInput="Assert related config products for simple product in Admin Product Form" stepKey="assertRelated2Comment"/>
139135
<actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated2">
140-
<argument name="element" value="AdminProductRelatedUpSellCrossSellSection.relatedProductSectionText"/>
136+
<argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
141137
<argument name="expectedText" value="$$baseConfigProductHandle.name$$"/>
142138
</actionGroup>
143139

144-
<comment userInput="Filter and edit config product" stepKey="Edit2"/>
140+
<comment userInput="Filter and edit config product" stepKey="filterAndEditComment2"/>
145141
<amOnPage url="{{AdminProductIndexPage}}" stepKey="productIndexPage2"/>
146-
<waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
142+
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
147143
<actionGroup ref="resetProductGridToDefaultView" stepKey="resetProductGridColumnsInitial2"/>
148144
<actionGroup ref="filterProductGridBySku" stepKey="filterProductGridConfig">
149145
<argument name="product" value="$$baseConfigProductHandle$$"/>
150146
</actionGroup>
151147
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit2"/>
152-
<waitForPageLoad time="30" stepKey="waitForPageLoad12"/>
153148
<conditionalClick selector="{{AdminProductFormSection.productFormTab('Related Products')}}" dependentSelector="{{AdminProductFormSection.productFormTabState('Related Products', 'closed')}}" visible="true" stepKey="openRelatedProductTab2"/>
154-
<waitForPageLoad time="30" stepKey="waitForPageLoad131"/>
149+
<waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
155150

156-
<comment userInput="Add related simple product to config product" stepKey="Add3"/>
151+
<comment userInput="Add related simple product to config product" stepKey="addSimpleToConfigComment"/>
157152
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddRelatedProductsButton}}" stepKey="clickAddRelatedProductButton3"/>
158-
<waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
159153
<actionGroup ref="filterProductGridBySku" stepKey="filterProductGridForConfig3">
160154
<argument name="product" value="$$simple2Handle$$"/>
161155
</actionGroup>
162156
<click selector="{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectSimpleTwo2"/>
163157
<click selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="selectClearAll3"/>
164158
<click selector="{{AdminAddRelatedProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected3"/>
165159

166-
<comment userInput="Save config product" stepKey="Save2"/>
160+
<comment userInput="Save config product" stepKey="saveConfigProductComment"/>
167161
<actionGroup ref="saveProductForm" stepKey="saveRelatedProduct2"/>
168-
<waitForPageLoad time="30" stepKey="waitForPageLoad17"/>
169162

170163
<comment userInput="Assert related simple product for config product in Admin Product Form" stepKey="assertRelated3Comment"/>
171164
<actionGroup ref="AssertTextInAdminProductRelatedUpSellCrossSellSection" stepKey="assertRelated3">
172-
<argument name="element" value="AdminProductRelatedUpSellCrossSellSection.relatedProductSectionText"/>
165+
<argument name="element" value="AdminProductFormRelatedUpSellCrossSellSection.relatedProductSectionText"/>
173166
<argument name="expectedText" value="$$simple2Handle.name$$"/>
174167
</actionGroup>
175168

176169
<comment userInput="Check storefront related products on simple product page" stepKey="navigateToSimpleProduct1PageComment"/>
177170
<amOnPage url="$$simple1Handle.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProduct1Page"/>
178-
<waitForPageLoad stepKey="waitForPageLoad18"/>
171+
<waitForPageLoad stepKey="waitForPageLoad9"/>
179172
<see selector="{{StorefrontProductRelatedProductsSection.relatedProductsActionsHeaderText}}" userInput="Check items to add to the cart" stepKey="assertRelatedProductHeaderInStorefront1"/>
180173
<see selector="{{StorefrontProductRelatedProductsSection.relatedProductsActionsHeaderText}}" userInput="select all" stepKey="assertRelatedProductHeaderInStorefront2"/>
181174
<see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="$$simple2Handle.name$$" stepKey="assertRelatedSimpleProductNameInStorefront"/>
182175
<see selector="{{StorefrontProductRelatedProductsSection.relatedProductsListSectionText}}" userInput="$$baseConfigProductHandle.name$$" stepKey="assertRelatedConfigProductNameInStorefront"/>
183176

184177
<comment userInput="Navigate to product page from related product link" stepKey="navigateToConfigProductFromRelatedSectionComment"/>
185178
<click selector="{{StorefrontProductRelatedProductsSection.relatedProductName('$$baseConfigProductHandle.custom_attributes[url_key]$$')}}" stepKey="clickRelatedProductByName"/>
186-
<waitForPageLoad stepKey="waitForPageLoad19"/>
179+
<waitForPageLoad stepKey="waitForPageLoad11"/>
187180
<seeInCurrentUrl url="$$baseConfigProductHandle.custom_attributes[url_key]$$" stepKey="seeInCurrentUrl"/>
188181

189182
<comment userInput="Select option for configurable product" stepKey="selectOptionConfigProduct"/>

0 commit comments

Comments
 (0)