Skip to content

Commit 08a0d0a

Browse files
committed
PB-69: Manually add products into ProductList by name/SKU and sort them by the order they added into the list
- Updating new MFTF actiongroup, data, section for filtering Products by SKU - Adding 2 new tests for filtering Products by SKU
1 parent 2524058 commit 08a0d0a

File tree

4 files changed

+219
-34
lines changed

4 files changed

+219
-34
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup.xml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<argument name="property" defaultValue="PageBuilderProductsSelectCategoryDropDown"/>
6161
<argument name="category" type="string"/>
6262
</arguments>
63+
<waitForPageLoad stepKey="waitForPageLoad"/>
6364
<waitForElementVisible time="2" selector="{{EditPanelForm.panelMultiSelectFieldControl(property.section, property.fieldName)}}" stepKey="waitForMultiSelectFieldVisible"/>
6465
<click selector="{{EditPanelForm.panelMultiSelectFieldControl(property.section, property.fieldName)}}" stepKey="clickMultiSelectField"/>
6566
<waitForElementVisible selector="{{EditPanelForm.panelMultiSelectFieldControlInput(property.section, property.fieldName)}}" stepKey="waitForSearchField"/>
@@ -70,6 +71,17 @@
7071
<waitForElementNotVisible selector="{{EditPanelForm.panelMultiSelectFieldControlInput(property.section, property.fieldName)}}" stepKey="waitForSearchFieldNotVisible"/>
7172
<see selector="{{EditPanelForm.panelMultiSelectFieldControl(property.section, property.fieldName)}}" userInput="{{category}}" stepKey="seeResultInField"/>
7273
</actionGroup>
74+
<actionGroup name="addSKUsToSelectProductsBySKU">
75+
<arguments>
76+
<argument name="property" defaultValue="PageBuilderProductsEnterSKUsInput"/>
77+
<argument name="SKUs" type="string"/>
78+
</arguments>
79+
<waitForPageLoad stepKey="waitForPageLoad"/>
80+
<waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
81+
<see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
82+
<fillField selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{SKUs}}" stepKey="fillPropertyField"/>
83+
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
84+
</actionGroup>
7385
<actionGroup name="addConditionToProductConditions">
7486
<arguments>
7587
<argument name="conditionType" defaultValue="PageBuilderProductsConditionCategory"/>
@@ -151,11 +163,4 @@
151163
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
152164
<see userInput="You must login or register to add items to your wishlist." stepKey="seeWishListSuccessMessage"/>
153165
</actionGroup>
154-
<actionGroup name="addSkusToSelectProductsBySku">
155-
<arguments>
156-
<argument name="skus" type="string"/>
157-
</arguments>
158-
<waitForPageLoad stepKey="waitSkuInputToLoad"/>
159-
<fillField selector="{{ProductsContentTypeForm.productsSkusInput}}" userInput="{{skus}}" stepKey="fillSelectProductsBySkuField"/>
160-
</actionGroup>
161166
</actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/Data/ProductsData.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<data key="fieldName">condition_option</data>
2525
<data key="value">category_ids</data>
2626
</entity>
27-
<entity name="PageBuilderProductsSelectProductsBySku" type="pagebuilder_select_products_by_types">
27+
<entity name="PageBuilderProductsSelectProductsBySKU" type="pagebuilder_select_products_by_types">
2828
<data key="name">Select Products By</data>
2929
<data key="section">general</data>
3030
<data key="fieldName">condition_option</data>
@@ -42,6 +42,12 @@
4242
<data key="section">general</data>
4343
<data key="fieldName">category_ids</data>
4444
</entity>
45+
<!-- SKU -->
46+
<entity name="PageBuilderProductsEnterSKUsInput" type="pagebuilder_products_sorting_types">
47+
<data key="name">Product SKUs</data>
48+
<data key="section">sku</data>
49+
<data key="fieldName">sku</data>
50+
</entity>
4551
<!-- Conditions -->
4652
<entity name="PageBuilderProductsConditionCombination" type="pagebuilder_products_condition_types">
4753
<data key="name">Conditions Combination</data>
@@ -78,7 +84,7 @@
7884
<data key="fieldName">sort_order</data>
7985
<data key="value">position</data>
8086
</entity>
81-
<entity name="PageBuilderProductsSortBySkuPosition" type="pagebuilder_products_sorting_types">
87+
<entity name="PageBuilderProductsSortBySKUPosition" type="pagebuilder_products_sorting_types">
8288
<data key="name">Sort By</data>
8389
<data key="section">general</data>
8490
<data key="fieldName">sort_order</data>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
<element name="conditionsCombinationAggregateBooleanSelector" type="button" selector="//ul[contains(@class,'rule-param-children')]//span[contains(@class,'rule-param')]//select[contains(@id,'1--{{arg1}}__value')]/ancestor::span[contains(@class,'rule-param')]//a" parameterized="true"/>
5151
<element name="conditionsCombinationAggregateBooleanSelectorSelect" type="button" selector="//ul[contains(@class,'rule-param-children')]//span[contains(@class,'rule-param')]//select[contains(@id,'1--{{arg1}}__value')]" parameterized="true"/>
5252
<element name="productsCountInput" type="input" selector="input[name='products_count']"/>
53-
<element name="productsSkusInput" type="input" selector="input[name='sku']"/>
5453
</section>
5554
<section name="ProductsOnStorefront">
5655
<element name="base" type="text" selector="(//div[contains(@data-content-type,'products')])[{{arg1}}]" parameterized="true"/>

0 commit comments

Comments
 (0)