Skip to content

Commit 4e61f24

Browse files
dhaeckerdhaecker
committed
PB-173: Add Carousel Settings to Product Appearance
- Adding permutations to AdminPageBuilderProductsCarouselAndGridAppearanceSettingsPersist test for SKU field - Changing actions to actiongroups
1 parent 241858a commit 4e61f24

File tree

2 files changed

+155
-36
lines changed

2 files changed

+155
-36
lines changed

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@
140140
<waitForElementNotVisible selector="{{EditPanelForm.panelMultiSelectFieldControlInput(property.section, property.fieldName)}}" stepKey="waitForSearchFieldNotVisible"/>
141141
<see selector="{{EditPanelForm.panelMultiSelectFieldControl(property.section, property.fieldName)}}" userInput="{{category}}" stepKey="seeResultInField"/>
142142
</actionGroup>
143+
<actionGroup name="seeCategoriesInCategorySelector">
144+
<arguments>
145+
<argument name="categories" defaultValue="" type="string"/>
146+
</arguments>
147+
<waitForElement selector="{{EditPanelForm.panelMultiSelectFieldControl(PageBuilderProductsSelectCategoryDropDown.section, PageBuilderProductsSelectCategoryDropDown.fieldName)}}" stepKey="waitForCategoriesField"/>
148+
<see selector="{{EditPanelForm.panelMultiSelectFieldControl(PageBuilderProductsSelectCategoryDropDown.section, PageBuilderProductsSelectCategoryDropDown.fieldName)}}" userInput="{{categories}}" stepKey="seeCategoriesInField"/>
149+
</actionGroup>
143150
<actionGroup name="addSKUsToSelectProductsBySKU">
144151
<arguments>
145152
<argument name="property" defaultValue="PageBuilderProductsEnterSKUsInput"/>
@@ -151,6 +158,13 @@
151158
<fillField selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{SKUs}}" stepKey="fillPropertyField"/>
152159
<click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
153160
</actionGroup>
161+
<actionGroup name="seeSKUsInSKUInputField">
162+
<arguments>
163+
<argument name="SKUs" defaultValue="" type="string"/>
164+
</arguments>
165+
<waitForElement selector="{{EditPanelForm.panelFieldControl(PageBuilderProductsEnterSKUsInput.section, PageBuilderProductsEnterSKUsInput.fieldName)}}" stepKey="waitForSKUsField"/>
166+
<seeInField selector="{{EditPanelForm.panelFieldControl(PageBuilderProductsEnterSKUsInput.section, PageBuilderProductsEnterSKUsInput.fieldName)}}" userInput="{{SKUs}}" stepKey="seeSKUsInField"/>
167+
</actionGroup>
154168
<actionGroup name="addConditionToProductConditions">
155169
<arguments>
156170
<argument name="conditionType" defaultValue="PageBuilderProductsConditionCategory"/>
@@ -187,6 +201,19 @@
187201
<waitForPageLoad stepKey="waitForAggregateTypeBooleanToLoad"/>
188202
<click selector="{{ProductsContentTypeForm.conditionsListText}}" stepKey="clearOptions2"/>
189203
</actionGroup>
204+
<actionGroup name="assertValueInConditionsFilter">
205+
<arguments>
206+
<argument name="indexOfCondition" defaultValue="1" type="string"/>
207+
<argument name="indexOfConditionParameter" defaultValue="2" type="string"/>
208+
<argument name="conditionValue" defaultValue="" type="string"/>
209+
</arguments>
210+
<waitForElement selector="{{ProductsContentTypeForm.conditionsListSavedValue(indexOfCondition, indexOfConditionParameter)}}" stepKey="waitForConditions"/>
211+
<grabTextFrom selector="{{ProductsContentTypeForm.conditionsListSavedValue(indexOfCondition, indexOfConditionParameter)}}" stepKey="grabConditionValue"/>
212+
<assertEquals stepKey="assertConditionValue">
213+
<expectedResult type="string">{{conditionValue}}</expectedResult>
214+
<actualResult type="variable">grabConditionValue</actualResult>
215+
</assertEquals>
216+
</actionGroup>
190217
<actionGroup name="clickProductImageInProductsOnStorefront">
191218
<arguments>
192219
<argument name="product" type="string"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTests.xml

Lines changed: 128 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,9 @@
467467
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSelectProductsByPersists2">
468468
<argument name="property" value="PageBuilderProductsSelectProductsByCategory"/>
469469
</actionGroup>
470-
<see selector="{{EditPanelForm.panelMultiSelectFieldControl(PageBuilderProductsSelectCategoryDropDown.section, PageBuilderProductsSelectCategoryDropDown.fieldName)}}" userInput="$$createCategory.name$$" stepKey="seeCategoryNamePersists2"/>
470+
<actionGroup ref="seeCategoriesInCategorySelector" stepKey="seeCategoryNamePersists2">
471+
<argument name="categories" value="$$createCategory.name$$"/>
472+
</actionGroup>
471473
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy2">
472474
<argument name="property" value="PageBuilderProductsSelectProductsByCondition"/>
473475
</actionGroup>
@@ -502,95 +504,185 @@
502504
<argument name="product" value="SortProduct2"/>
503505
<argument name="productIndex" value="2"/>
504506
</actionGroup>
505-
<!-- Set to Carousel, Remain as Filter By Condition Category, Sort By Newest First, Show 4 Products -->
507+
<!-- Remain as Grid, Filter By SKU, Sort By Position, Show 3 Products -->
506508
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel3">
507509
<argument name="contentType" value="PageBuilderProductsContentType"/>
508510
</actionGroup>
509511
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAppearancePersists3">
510512
<argument name="property" value="PageBuilderProductsProductGridAppearance"/>
511513
</actionGroup>
512-
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance3">
513-
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
514-
</actionGroup>
515514
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSelectProductsByPersists3">
516515
<argument name="property" value="PageBuilderProductsSelectProductsByCondition"/>
517516
</actionGroup>
518-
<grabTextFrom selector="{{ProductsContentTypeForm.conditionsListSavedValue('1','2')}}" stepKey="grabConditionValue3"/>
519-
<assertEquals stepKey="assertCategoryConditionValue3">
520-
<expectedResult type="string">$$createCategory.id$$</expectedResult>
521-
<actualResult type="variable">grabConditionValue3</actualResult>
522-
</assertEquals>
523-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSortByPersists3">
524-
<argument name="property" value="PageBuilderProductsSortByOldestTop"/>
517+
<actionGroup ref="assertValueInConditionsFilter" stepKey="assertCategoryConditionValue3">
518+
<argument name="conditionValue" value="$$createCategory.id$$"/>
519+
</actionGroup>
520+
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy3">
521+
<argument name="property" value="PageBuilderProductsSelectProductsBySKU"/>
522+
</actionGroup>
523+
<actionGroup ref="addSKUsToSelectProductsBySKU" stepKey="addProductsSKUsToInputField3">
524+
<argument name="SKUs" value="$$createProduct2.sku$$,$$createProduct1.sku$$"/>
525525
</actionGroup>
526526
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterSortBy3">
527-
<argument name="property" value="PageBuilderProductsSortByNewestTop"/>
527+
<argument name="property" value="PageBuilderProductsSortBySKUPosition"/>
528528
</actionGroup>
529-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateDefaultNumberOfProductsToDisplay3">
530-
<argument name="property" value="PageBuilderProductsCarouselCountPropertyTwenty"/>
529+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateNumberOfProductsToDisplayPersists3">
530+
<argument name="property" value="PageBuilderProductsCountPropertyTwo"/>
531531
</actionGroup>
532532
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount3">
533-
<argument name="property" value="PageBuilderProductsCarouselCountPropertyMax"/>
533+
<argument name="property" value="PageBuilderProductsCountPropertyFive"/>
534534
</actionGroup>
535535
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
536536
<!-- Validate Stage 3 -->
537537
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductCountStage3">
538-
<argument name="page" value="ProductsCarouselOnStage"/>
538+
<argument name="page" value="ProductsOnStage"/>
539539
<argument name="count" value="2"/>
540540
</actionGroup>
541541
<actionGroup ref="validateProductInProducts" stepKey="validateProduct1Stage3">
542+
<argument name="page" value="ProductsOnStage"/>
543+
<argument name="product" value="SortProduct2"/>
544+
<argument name="productIndex" value="1"/>
545+
</actionGroup>
546+
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage3">
547+
<argument name="page" value="ProductsOnStage"/>
548+
<argument name="product" value="SortProduct1"/>
549+
<argument name="productIndex" value="2"/>
550+
</actionGroup>
551+
<!-- Set to Carousel, Remain as Filter By SKU, Sort By Oldest First, Show 1 Products -->
552+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel4">
553+
<argument name="contentType" value="PageBuilderProductsContentType"/>
554+
</actionGroup>
555+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAppearancePersists4">
556+
<argument name="property" value="PageBuilderProductsProductGridAppearance"/>
557+
</actionGroup>
558+
<actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance4">
559+
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
560+
</actionGroup>
561+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSelectProductsByPersists4">
562+
<argument name="property" value="PageBuilderProductsSelectProductsBySKU"/>
563+
</actionGroup>
564+
<actionGroup ref="seeSKUsInSKUInputField" stepKey="seeSKUsPersist4">
565+
<argument name="SKUs" value="$$createProduct2.sku$$,$$createProduct1.sku$$"/>
566+
</actionGroup>
567+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSortByPersists4">
568+
<argument name="property" value="PageBuilderProductsSortBySKUPosition"/>
569+
</actionGroup>
570+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterSortBy4">
571+
<argument name="property" value="PageBuilderProductsSortByOldestTop"/>
572+
</actionGroup>
573+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateDefaultNumberOfProductsToDisplay4">
574+
<argument name="property" value="PageBuilderProductsCarouselCountPropertyTwenty"/>
575+
</actionGroup>
576+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount4">
577+
<argument name="property" value="PageBuilderProductsCarouselCountPropertyOne"/>
578+
</actionGroup>
579+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
580+
<!-- Validate Stage 4 -->
581+
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductCountStage4">
582+
<argument name="page" value="ProductsCarouselOnStage"/>
583+
<argument name="count" value="1"/>
584+
</actionGroup>
585+
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage4">
586+
<argument name="page" value="ProductsCarouselOnStage"/>
587+
<argument name="product" value="SortProduct1"/>
588+
<argument name="productIndex" value="1"/>
589+
</actionGroup>
590+
<!-- Remain as Carousel, Filter By Condition Category, Sort By Newest First, Show 4 Products -->
591+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel5">
592+
<argument name="contentType" value="PageBuilderProductsContentType"/>
593+
</actionGroup>
594+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAppearancePersists5">
595+
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
596+
</actionGroup>
597+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSelectProductsByPersists5">
598+
<argument name="property" value="PageBuilderProductsSelectProductsBySKU"/>
599+
</actionGroup>
600+
<actionGroup ref="seeSKUsInSKUInputField" stepKey="seeSKUsPersist5">
601+
<argument name="SKUs" value="$$createProduct2.sku$$,$$createProduct1.sku$$"/>
602+
</actionGroup>
603+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSortByPersists5">
604+
<argument name="property" value="PageBuilderProductsSortByOldestTop"/>
605+
</actionGroup>
606+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateDefaultNumberOfProductsToDisplay5">
607+
<argument name="property" value="PageBuilderProductsCarouselCountPropertyOne"/>
608+
</actionGroup>
609+
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy5">
610+
<argument name="property" value="PageBuilderProductsSelectProductsByCondition"/>
611+
</actionGroup>
612+
<actionGroup ref="assertValueInConditionsFilter" stepKey="assertCategoryConditionValue5">
613+
<argument name="conditionValue" value="$$createCategory.id$$"/>
614+
</actionGroup>
615+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSortByPersistsAgain5">
616+
<argument name="property" value="PageBuilderProductsSortByOldestTop"/>
617+
</actionGroup>
618+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterSortBy5">
619+
<argument name="property" value="PageBuilderProductsSortByNewestTop"/>
620+
</actionGroup>
621+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount5">
622+
<argument name="property" value="PageBuilderProductsCarouselCountPropertyMax"/>
623+
</actionGroup>
624+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings5"/>
625+
<!-- Validate Stage 5 -->
626+
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductCountStage5">
627+
<argument name="page" value="ProductsCarouselOnStage"/>
628+
<argument name="count" value="2"/>
629+
</actionGroup>
630+
<actionGroup ref="validateProductInProducts" stepKey="validateProduct1Stage5">
542631
<argument name="page" value="ProductsCarouselOnStage"/>
543632
<argument name="product" value="SortProduct1"/>
544633
<argument name="productIndex" value="2"/>
545634
</actionGroup>
546-
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage3">
635+
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage5">
547636
<argument name="page" value="ProductsCarouselOnStage"/>
548637
<argument name="product" value="SortProduct2"/>
549638
<argument name="productIndex" value="1"/>
550639
</actionGroup>
551640
<!-- Remain as Carousel, Filter By Category, Sort By Position, Show 4 Products -->
552-
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel4">
641+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel6">
553642
<argument name="contentType" value="PageBuilderProductsContentType"/>
554643
</actionGroup>
555-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAppearancePersists4">
644+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateAppearancePersists6">
556645
<argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
557646
</actionGroup>
558-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSelectProductsByPersists4">
647+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSelectProductsByPersists6">
559648
<argument name="property" value="PageBuilderProductsSelectProductsByCondition"/>
560649
</actionGroup>
561-
<grabTextFrom selector="{{ProductsContentTypeForm.conditionsListSavedValue('1','2')}}" stepKey="grabConditionValue4"/>
562-
<assertEquals stepKey="assertCategoryConditionValue4">
563-
<expectedResult type="string">$$createCategory.id$$</expectedResult>
564-
<actualResult type="variable">grabConditionValue4</actualResult>
565-
</assertEquals>
566-
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy4">
650+
<actionGroup ref="assertValueInConditionsFilter" stepKey="assertCategoryConditionValue6">
651+
<argument name="conditionValue" value="$$createCategory.id$$"/>
652+
</actionGroup>
653+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateDefaultNumberOfProductsToDisplay6">
654+
<argument name="property" value="PageBuilderProductsCarouselCountPropertyMax"/>
655+
</actionGroup>
656+
<actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy6">
567657
<argument name="property" value="PageBuilderProductsSelectProductsByCategory"/>
568658
</actionGroup>
569-
<see selector="{{EditPanelForm.panelMultiSelectFieldControl(PageBuilderProductsSelectCategoryDropDown.section, PageBuilderProductsSelectCategoryDropDown.fieldName)}}" userInput="$$createCategory.name$$" stepKey="seeCategoryNamePersists4"/>
570-
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSortByChangesToNewestFirst4">
659+
<actionGroup ref="seeCategoriesInCategorySelector" stepKey="seeCategoryNamePersists6">
660+
<argument name="categories" value="$$createCategory.name$$"/>
661+
</actionGroup>
662+
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateSortByChangesToNewestFirst6">
571663
<argument name="property" value="PageBuilderProductsSortByNewestTop"/>
572664
</actionGroup>
573-
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterSortBy4">
665+
<actionGroup ref="selectSlideOutPanelFieldGeneral" stepKey="enterSortBy6">
574666
<argument name="property" value="PageBuilderProductsSortByOldestTop"/>
575667
</actionGroup>
576-
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateDefaultNumberOfProductsToDisplay4">
668+
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="validateDefaultNumberOfProductsToDisplayAgain6">
577669
<argument name="property" value="PageBuilderProductsCarouselCountPropertyMax"/>
578670
</actionGroup>
579-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount4">
671+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount6">
580672
<argument name="property" value="PageBuilderProductsCarouselCountPropertyFour"/>
581673
</actionGroup>
582-
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings4"/>
674+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings6"/>
583675
<!-- Validate Stage 4 -->
584-
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductCountStage4">
676+
<actionGroup ref="validateProductCountInProducts" stepKey="validateProductCountStage6">
585677
<argument name="page" value="ProductsCarouselOnStage"/>
586678
<argument name="count" value="2"/>
587679
</actionGroup>
588-
<actionGroup ref="validateProductInProducts" stepKey="validateProduct1Stage4">
680+
<actionGroup ref="validateProductInProducts" stepKey="validateProduct1Stage6">
589681
<argument name="page" value="ProductsCarouselOnStage"/>
590682
<argument name="product" value="SortProduct1"/>
591683
<argument name="productIndex" value="1"/>
592684
</actionGroup>
593-
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage4">
685+
<actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage6">
594686
<argument name="page" value="ProductsCarouselOnStage"/>
595687
<argument name="product" value="SortProduct2"/>
596688
<argument name="productIndex" value="2"/>

0 commit comments

Comments
 (0)