Skip to content

Commit 00187a0

Browse files
oleg-onuferoleg-onufer
committed
MAGETWO-93217: Automate with MFTF Configurable Product is searchable by Attributes of child Products
1 parent e2f19ec commit 00187a0

File tree

7 files changed

+26
-51
lines changed

7 files changed

+26
-51
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,4 @@
4848
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
4949
<see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
5050
</actionGroup>
51-
52-
<!--Open product for edit by clicking row X and column Y in product grid-->
53-
<actionGroup name="openProducForEditByClickingRowXColumnYInProductGrid">
54-
<arguments>
55-
<argument name="X" type="string" defaultValue="1"/>
56-
<argument name="Y" type="string" defaultValue="2"/>
57-
</arguments>
58-
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton(X, Y)}}" stepKey="openProductForEdit"/>
59-
</actionGroup>
6051
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,4 @@
4949
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
5050
<click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="confirmProductDelete"/>
5151
</actionGroup>
52-
53-
<!--Filter the product grid by the SKU string -->
54-
<actionGroup name="filterProductGridBySku2">
55-
<arguments>
56-
<argument name="sku" type="string"/>
57-
</arguments>
58-
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
59-
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
60-
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
61-
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
62-
<waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
63-
</actionGroup>
6452
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<data key="used_for_sort_by">true</data>
5454
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
5555
</entity>
56-
<entity name="productAttributeMultiselectTwoOptions" type="ProductAttribute">
56+
<entity name="ProductAttributeMultiselectTwoOptions" type="ProductAttribute">
5757
<data key="attribute_code" unique="suffix">attribute</data>
5858
<data key="frontend_input">multiselect</data>
5959
<data key="scope">global</data>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,31 @@
2727
<entity name="ProductAttributeOptionGetter" type="ProductAttributeOption">
2828
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
2929
</entity>
30-
<entity name="productAttributeOption" type="ProductAttributeOption">
31-
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
32-
<data key="label" unique="suffix">customOption</data>
33-
<data key="is_default">false</data>
34-
<data key="sort_order">0</data>
35-
</entity>
36-
<entity name="productAttributeOption3" type="ProductAttributeOption">
30+
<entity name="ProductAttributeOption3" type="ProductAttributeOption">
3731
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
3832
<data key="label" unique="suffix">option3</data>
3933
<data key="is_default">false</data>
4034
<data key="sort_order">2</data>
4135
<requiredEntity type="StoreLabel">Option3Store0</requiredEntity>
4236
<requiredEntity type="StoreLabel">Option3Store1</requiredEntity>
4337
</entity>
44-
<entity name="productAttributeOption4" type="ProductAttributeOption">
38+
<entity name="ProductAttributeOption4" type="ProductAttributeOption">
4539
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
4640
<data key="label" unique="suffix">option4</data>
4741
<data key="is_default">false</data>
4842
<data key="sort_order">3</data>
4943
<requiredEntity type="StoreLabel">Option4Store0</requiredEntity>
5044
<requiredEntity type="StoreLabel">Option4Store1</requiredEntity>
5145
</entity>
52-
<entity name="productAttributeOption5" type="ProductAttributeOption">
46+
<entity name="ProductAttributeOption5" type="ProductAttributeOption">
5347
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
5448
<data key="label" unique="suffix">option5</data>
5549
<data key="is_default">false</data>
5650
<data key="sort_order">4</data>
5751
<requiredEntity type="StoreLabel">Option5Store0</requiredEntity>
5852
<requiredEntity type="StoreLabel">Option5Store1</requiredEntity>
5953
</entity>
60-
<entity name="productAttributeOption6" type="ProductAttributeOption">
54+
<entity name="ProductAttributeOption6" type="ProductAttributeOption">
6155
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
6256
<data key="label" unique="suffix">option6</data>
6357
<data key="is_default">false</data>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<element name="name" type="input" selector="#attribute_set_name"/>
1717
<element name="basedOn" type="select" selector="#skeleton_set"/>
1818
</section>
19-
<section name="ModifyAttributesSection">
19+
<section name="AdminModifyAttributesSection">
2020
<!-- Parameter is the attribute name -->
21-
<element name="nthExistingAttribute" type="select" selector="//*[text()='{{attributeName}}']/../..//select" parameterized="true"/>
21+
<element name="dropDown" type="select" selector="//*[text()='{{attributeName}}']/../..//select" parameterized="true"/>
2222
</section>
2323
</sections>

‎app/code/Magento/Cms/Test/Mftf/Page/StorefrontHomePage.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
1111
<page name="StorefrontHomePage" url="/" module="Magento_Cms" area="storefront">
1212
<section name="StorefrontHeaderSection"/>
13+
<section name="StorefrontQuickSearchSection"/>
1314
</page>
1415
</pages>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
<description value="Guest customer should be able to search configurable product by attributes of child products"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-75997"/>
19-
<group value="ConfigurableProduct"/>
19+
<group value="configurable"/>
20+
<group value="product"/>
2021
</annotations>
2122
<before>
2223
<!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
@@ -38,11 +39,11 @@
3839
</createData>
3940

4041
<!-- Create an attribute with two options to be used in the second child product -->
41-
<createData entity="productAttributeMultiselectTwoOptions" stepKey="createConfigProductAttributeMultiSelect"/>
42-
<createData entity="productAttributeOption3" stepKey="createConfigProductAttributeOption1Multiselect">
42+
<createData entity="ProductAttributeMultiselectTwoOptions" stepKey="createConfigProductAttributeMultiSelect"/>
43+
<createData entity="ProductAttributeOption3" stepKey="createConfigProductAttributeOption1Multiselect">
4344
<requiredEntity createDataKey="createConfigProductAttributeMultiSelect"/>
4445
</createData>
45-
<createData entity="productAttributeOption4" stepKey="createConfigProductAttributeOption2Multiselect">
46+
<createData entity="ProductAttributeOption4" stepKey="createConfigProductAttributeOption2Multiselect">
4647
<requiredEntity createDataKey="createConfigProductAttributeMultiSelect"/>
4748
</createData>
4849

@@ -106,10 +107,10 @@
106107

107108
<!-- Create an attribute with two options to be used in the first child product (in the UI) -->
108109
<createData entity="productAttributeWithDropdownTwoOptions" stepKey="createConfigProductAttributeSelect"/>
109-
<createData entity="productAttributeOption5" stepKey="createConfigProductAttributeSelectOption1">
110+
<createData entity="ProductAttributeOption5" stepKey="createConfigProductAttributeSelectOption1">
110111
<requiredEntity createDataKey="createConfigProductAttributeSelect"/>
111112
</createData>
112-
<createData entity="productAttributeOption6" stepKey="createConfigProductAttributeSelectOption2">
113+
<createData entity="ProductAttributeOption6" stepKey="createConfigProductAttributeSelectOption2">
113114
<requiredEntity createDataKey="createConfigProductAttributeSelect"/>
114115
</createData>
115116

@@ -123,27 +124,27 @@
123124
<!-- Go to the product page for the first product -->
124125
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductGrid"/>
125126
<waitForPageLoad stepKey="waitForProductGridLoad"/>
126-
<actionGroup ref="filterProductGridBySku2" stepKey="searchForSimpleProduct">
127-
<argument name="sku" value="$$createConfigChildProduct1.sku$$"/>
127+
<actionGroup ref="filterProductGridBySku" stepKey="searchForSimpleProduct">
128+
<argument name="product" value="$$createConfigChildProduct1$$"/>
128129
</actionGroup>
129-
<actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProductEditPage"/>
130-
130+
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit"/>
131+
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
131132
<!-- Edit the attribute for the first simple product -->
132-
<selectOption selector="{{ModifyAttributesSection.nthExistingAttribute($$createConfigProductAttributeSelect.default_frontend_label$$)}}" userInput="$$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$" stepKey="editSelectAttribute"/>
133+
<selectOption selector="{{AdminModifyAttributesSection.dropDown($$createConfigProductAttributeSelect.default_frontend_label$$)}}" userInput="$$createConfigProductAttributeSelectOption1.option[store_labels][0][label]$$" stepKey="editSelectAttribute"/>
133134
<scrollToTopOfPage stepKey="scrollToTop"/>
134135
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
135136
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
136137

137138
<!-- Go to the product page for the second product -->
138139
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductGrid2"/>
139140
<waitForPageLoad stepKey="waitForProductGridLoad2"/>
140-
<actionGroup ref="filterProductGridBySku2" stepKey="searchForSimpleProduct2">
141-
<argument name="sku" value="$$createConfigChildProduct2.sku$$"/>
141+
<actionGroup ref="filterProductGridBySku" stepKey="searchForSimpleProduct2">
142+
<argument name="product" value="$$createConfigChildProduct2$$"/>
142143
</actionGroup>
143-
<actionGroup ref="openProducForEditByClickingRowXColumnYInProductGrid" stepKey="openProductEditPage2"/>
144-
144+
<click selector="{{AdminProductGridSection.productGridXRowYColumnButton('1', '2')}}" stepKey="openProductForEdit2"/>
145+
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
145146
<!-- Edit the attribute for the first second product -->
146-
<selectOption selector="{{ModifyAttributesSection.nthExistingAttribute($$createConfigProductAttributeMultiSelect.default_frontend_label$$)}}" userInput="$$createConfigProductAttributeOption2Multiselect.option[store_labels][0][label]$$" stepKey="editSelectAttribute2"/>
147+
<selectOption selector="{{AdminModifyAttributesSection.dropDown($$createConfigProductAttributeMultiSelect.default_frontend_label$$)}}" userInput="$$createConfigProductAttributeOption2Multiselect.option[store_labels][0][label]$$" stepKey="editSelectAttribute2"/>
147148
<scrollToTopOfPage stepKey="scrollToTop2"/>
148149
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct2"/>
149150
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess2"/>
@@ -153,7 +154,7 @@
153154
</before>
154155

155156
<after>
156-
<amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>
157+
<actionGroup ref="logout" stepKey="logout"/>
157158
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
158159
<deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
159160
<deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>

0 commit comments

Comments
 (0)