Skip to content

Commit 890beae

Browse files
author
Hwashiang Yu
committed
Merge remote-tracking branch 'origin/MC-3226-add-missing-p0-p1-mftf-tests-for-divider' into cms-team-2-sprint-13
2 parents f904f92 + 5e160be commit 890beae

File tree

2 files changed

+165
-29
lines changed

2 files changed

+165
-29
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="PageBuilderStoreFront">
12-
<element name="contentTypeInsideContainerStorefront" type="button" selector='(//div[@data-role="{{arg1}}"])[{{arg2}}]//div|figure[@data-role="{{arg3}}"][{{arg4}}]' parameterized="true"/>
12+
<element name="contentTypeInsideContainerStorefront" type="button" selector='(//div[@data-role="{{arg1}}"])[{{arg2}}]//*[@data-role="{{arg3}}"][{{arg4}}]' parameterized="true"/>
1313
<element name="imageSourceOnFrontEnd" type="button" selector="//div[not(contains(@class, 'pagebuilder-mobile-hidden')) and contains(@style, '{{var1}}')]" parameterized="true" />
1414
</section>
1515
</sections>

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

Lines changed: 164 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -91,34 +91,6 @@
9191
<argument name="width" value="PageBuilderDividerLineWidth_50"/>
9292
</actionGroup>
9393
</test>
94-
<test name="DividerDelete">
95-
<annotations>
96-
<features value="PageBuilder"/>
97-
<stories value="Divider"/>
98-
<title value="Delete Divider"/>
99-
<description value="A user should be able to delete a Divider content type. Verify on Stage amd Storefront."/>
100-
<severity value="CRITICAL"/>
101-
<useCaseId value="MAGETWO-83931"/>
102-
<testCaseId value="MAGETWO-89785"/>
103-
<group value="pagebuilder"/>
104-
<group value="pagebuilder-divider"/>
105-
</annotations>
106-
<before>
107-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
108-
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
109-
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
110-
</before>
111-
<after>
112-
<actionGroup ref="logout" stepKey="logout"/>
113-
</after>
114-
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
115-
<argument name="contentType" value="PageBuilderDividerContentType"/>
116-
</actionGroup>
117-
<actionGroup ref="removeEmptyContentTypeFromStage" stepKey="removeEmptyContentTypeFromStage">
118-
<argument name="contentType" value="PageBuilderDividerContentType"/>
119-
</actionGroup>
120-
<dontSeeElement selector="{{PageBuilderStage.contentTypeInStage(PageBuilderDividerContentType.role)}}" stepKey="dontSeeContentTypeInStage"/>
121-
</test>
12294
<test name="DividerValidateGeneralDefaultValues">
12395
<annotations>
12496
<features value="PageBuilder"/>
@@ -862,4 +834,168 @@
862834
<argument name="containerTargetIndex" value="2"/>
863835
</actionGroup>
864836
</test>
837+
<test name="DividerDelete">
838+
<annotations>
839+
<features value="PageBuilder"/>
840+
<stories value="Divider"/>
841+
<title value="Delete Divider"/>
842+
<description value="A user should be able to delete a Divider content type. Verify on Stage amd Storefront."/>
843+
<severity value="CRITICAL"/>
844+
<useCaseId value="MAGETWO-83931"/>
845+
<testCaseId value="MC-2546"/>
846+
<group value="pagebuilder"/>
847+
<group value="pagebuilder-divider"/>
848+
<group value="pagebuilder-dividerCommon"/>
849+
</annotations>
850+
<before>
851+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
852+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
853+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
854+
</before>
855+
<after>
856+
<actionGroup ref="logout" stepKey="logout"/>
857+
</after>
858+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
859+
<argument name="contentType" value="PageBuilderDividerContentType"/>
860+
</actionGroup>
861+
<!-- Add Divider and Save Page -->
862+
<comment userInput="Add Divider and Save Page" stepKey="commentAddDivider"/>
863+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
864+
<argument name="group" value="PageBuilderDividerContentType"/>
865+
</actionGroup>
866+
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeIntoStage">
867+
<argument name="contentType" value="PageBuilderDividerContentType"/>
868+
</actionGroup>
869+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
870+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
871+
<!-- Delete Divider -->
872+
<comment userInput="Delete Divider" stepKey="commentDeleteDivider"/>
873+
<actionGroup ref="removeContentTypeFromStage" stepKey="removeContentTypeFromStage">
874+
<argument name="contentType" value="PageBuilderDividerContentType"/>
875+
</actionGroup>
876+
<!-- Validate Stage -->
877+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
878+
<dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInStageByIndex(PageBuilderDividerContentType.role, '1')}}" stepKey="dontSeeContentTypeInStage"/>
879+
<!-- Save Page -->
880+
<comment userInput="Save Page" stepKey="commentSavePage"/>
881+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
882+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
883+
<!-- Validate Stage After Save -->
884+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage2"/>
885+
<dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInStageByIndex(PageBuilderDividerContentType.role, '1')}}" stepKey="dontSeeContentTypeInStage2"/>
886+
<!-- Validate Storefront -->
887+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
888+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
889+
<argument name="contentType" value="PageBuilderDividerContentType"/>
890+
</actionGroup>
891+
<dontSeeElementInDOM selector="{{DividerOnStorefront.base('1')}}" stepKey="dontSeeContentTypeInStorefront"/>
892+
</test>
893+
<test name="DividerMoveDivider">
894+
<annotations>
895+
<features value="PageBuilder"/>
896+
<stories value="Divider"/>
897+
<title value="Move Divider Between Columns"/>
898+
<description value="Verify that moving a divider content type on the stage will update the storefront"/>
899+
<severity value="CRITICAL"/>
900+
<useCaseId value="MC-3226"/>
901+
<testCaseId value="MC-3370"/>
902+
<group value="pagebuilder"/>
903+
<group value="pagebuilder-divider"/>
904+
<group value="pagebuilder-dividerCommon"/>
905+
<group value="pagebuilder-column"/>
906+
</annotations>
907+
<before>
908+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
909+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
910+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
911+
</before>
912+
<after>
913+
<actionGroup ref="logout" stepKey="logout"/>
914+
</after>
915+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
916+
<argument name="contentType" value="PageBuilderDividerContentType"/>
917+
</actionGroup>
918+
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
919+
<argument name="contentType" value="PageBuilderColumnContentType"/>
920+
</actionGroup>
921+
<!-- Add Heading to Stage -->
922+
<comment userInput="Add Heading to Stage" stepKey="commentAddHeadingToStage"/>
923+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToColumn">
924+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
925+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
926+
<argument name="containerTargetIndex" value="2" />
927+
</actionGroup>
928+
<actionGroup ref="enterHeadingOnStage" stepKey="enterHeadingOnStage">
929+
<argument name="headingText" value="PageBuilderHeadingTextProperty"/>
930+
</actionGroup>
931+
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
932+
<argument name="index" value="1"/>
933+
</actionGroup>
934+
<!-- Add Divider to Stage -->
935+
<comment userInput="Add Divider to Stage" stepKey="commentAddDividerToStage"/>
936+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
937+
<argument name="group" value="PageBuilderDividerContentType"/>
938+
</actionGroup>
939+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerToColumn">
940+
<argument name="contentType" value="PageBuilderDividerContentType"/>
941+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
942+
<argument name="containerTargetIndex" value="2" />
943+
</actionGroup>
944+
<!-- Validate Stage -->
945+
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
946+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHeadingStage">
947+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
948+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
949+
<argument name="positionInContainer" value="1"/>
950+
<argument name="contentTypeIndex" value="1"/>
951+
<argument name="containerTargetIndex" value="2"/>
952+
</actionGroup>
953+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateDividerStage">
954+
<argument name="contentType" value="PageBuilderDividerContentType"/>
955+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
956+
<argument name="positionInContainer" value="2"/>
957+
<argument name="contentTypeIndex" value="1"/>
958+
<argument name="containerTargetIndex" value="2"/>
959+
</actionGroup>
960+
<!-- Move Divider -->
961+
<comment userInput="Move Divider" stepKey="commentMoveDivider"/>
962+
<actionGroup ref="moveContentTypeToContainer" stepKey="moveDividerToLeftColumn">
963+
<argument name="contentType" value="PageBuilderDividerContentType"/>
964+
<argument name="contentTypeIndex" value="1"/>
965+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
966+
<argument name="containerTargetIndex" value="1"/>
967+
</actionGroup>
968+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHeadingStage2">
969+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
970+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
971+
<argument name="contentTypeIndex" value="1"/>
972+
<argument name="containerTargetIndex" value="2"/>
973+
</actionGroup>
974+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateDividerStage2">
975+
<argument name="contentType" value="PageBuilderDividerContentType"/>
976+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
977+
<argument name="contentTypeIndex" value="1"/>
978+
<argument name="containerTargetIndex" value="1"/>
979+
</actionGroup>
980+
<!-- Save Page -->
981+
<comment userInput="Save Page" stepKey="commentSavePage"/>
982+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
983+
<!-- Validate Storefront -->
984+
<comment userInput="Validate Storefront" stepKey="validateStorefront"/>
985+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
986+
<argument name="contentType" value="PageBuilderDividerContentType"/>
987+
</actionGroup>
988+
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="validateHeadingStorefront">
989+
<argument name="contentType" value="PageBuilderHeadingContentType"/>
990+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
991+
<argument name="contentTypeIndex" value="1"/>
992+
<argument name="containerTargetIndex" value="2"/>
993+
</actionGroup>
994+
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="validateDividerStorefront">
995+
<argument name="contentType" value="PageBuilderDividerContentType"/>
996+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
997+
<argument name="contentTypeIndex" value="1"/>
998+
<argument name="containerTargetIndex" value="1"/>
999+
</actionGroup>
1000+
</test>
8651001
</tests>

0 commit comments

Comments
 (0)