Skip to content

Commit f804e25

Browse files
dhaeckerdhaecker
committed
MC-3228: Add Missing P0-P1 MFTF Tests For Slider
- Fixing inline editing slide tests - Fixing flaky tests
1 parent 1fd9108 commit f804e25

7 files changed

+181
-335
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
110110
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
111111
<fillField selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
112+
<waitForPageLoad stepKey="waitForPageLoad"/>
112113
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
113114
</actionGroup>
114115
<actionGroup name="inlineEditTextAreaFromStage">
@@ -120,6 +121,7 @@
120121
<click selector="{{PageBuilderStage.inlineTextAreaEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
121122
<waitForPageLoad stepKey="waitForPageLoad"/>
122123
<fillField selector="{{PageBuilderStage.inlineTextAreaEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
124+
<waitForPageLoad stepKey="waitForPageLoad1"/>
123125
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
124126
</actionGroup>
125127
<actionGroup name="verifyUploadImageButtons">

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<!-- Content Configuration -->
9797
<element name="messageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//p[.='{{arg2}}']" parameterized="true"/>
9898
<element name="noMessageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content'][not(*)]" parameterized="true"/>
99+
<element name="messageContentTextArea" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
99100
<element name="linkUrl" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//a[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
100101
<element name="openInNewTab" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/a[contains(@target,'_blank')]" parameterized="true"/>
101102
<element name="button" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image']//button[@data-element='button']" parameterized="true"/>
@@ -191,11 +192,9 @@
191192
<element name="collageMargins" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
192193
<element name="posterPadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'padding: {{arg2}};')]" parameterized="true"/>
193194
<element name="collagePadding" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'padding: {{arg2}};')]" parameterized="true"/>
194-
<element name="tinymce" type="button" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg1}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
195-
<element name="tinymcePanel" type="button" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg1}}]//div[contains(@class, 'mce-tinymce-inline')]" parameterized="true"/>
196-
<element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{arg1}}]//textarea[contains(@class, 'inline-wysiwyg-textarea') and contains(@placeholder,'Edit Slide Text')]" parameterized="true"/>
197195
</section>
198196
<section name="SlideOnConfigurationPanel">
197+
<element name="textArea" type="text" selector="#pagebuilder_slide_form_content"/>
199198
<element name="tinyMCEIFrame" type="text" selector="pagebuilder_slide_form_content_ifr"/>
200199
<element name="textInIFrame" type="text" selector="//body//p[.='{{arg1}}']" parameterized="true"/>
201200
</section>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="SlideItemCollageCenterCanInlineEditContent" extends="SlideItemPosterCanInlineEditContent">
12+
<annotations>
13+
<features value="PageBuilder"/>
14+
<stories value="Slider"/>
15+
<title value="Collage Center - Can Inline Edit Slide Content"/>
16+
<description value="Verify that users are able to inline edit a collage center Slide's content from the stage"/>
17+
<severity value="MAJOR"/>
18+
<useCaseId value="MC-937"/>
19+
<testCaseId value="MC-3849"/>
20+
<group value="pagebuilder"/>
21+
<group value="pagebuilder-slide"/>
22+
<group value="pagebuilder-slideItemCollageCenter"/>
23+
</annotations>
24+
<actionGroup ref="chooseVisualSelectOption" after="dragSliderIntoStage" stepKey="enterAppearancePropertyExtended">
25+
<argument name="property" value="PageBuilderAppearance_CollageCentered"/>
26+
</actionGroup>
27+
<actionGroup ref="saveEditPanelSettings" stepKey="closeEditPanelSettings"/>
28+
</test>
1129
<test name="SlideCollageCenteredMobileWithMobileImageValues">
1230
<annotations>
1331
<features value="PageBuilder"/>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="SlideItemCollageLeftCanInlineEditContent" extends="SlideItemPosterCanInlineEditContent">
12+
<annotations>
13+
<features value="PageBuilder"/>
14+
<stories value="Slider"/>
15+
<title value="Collage Left - Can Inline Edit Slide Content"/>
16+
<description value="Verify that users are able to inline edit a collage left Slide's content from the stage"/>
17+
<severity value="MAJOR"/>
18+
<useCaseId value="MC-937"/>
19+
<testCaseId value="MC-3846"/>
20+
<group value="pagebuilder"/>
21+
<group value="pagebuilder-slide"/>
22+
<group value="pagebuilder-slideItemCollageLeft"/>
23+
</annotations>
24+
<actionGroup ref="chooseVisualSelectOption" after="dragSliderIntoStage" stepKey="enterAppearancePropertyExtended">
25+
<argument name="property" value="PageBuilderAppearance_CollageLeft"/>
26+
</actionGroup>
27+
<actionGroup ref="saveEditPanelSettings" stepKey="closeEditPanelSettings"/>
28+
</test>
1129
<test name="SlideCollageLeftMobileWithMobileImageValues" extends="SlideCollageCenteredMobileWithMobileImageValues">
1230
<annotations>
1331
<features value="PageBuilder"/>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="SlideItemCollageRightCanInlineEditContent" extends="SlideItemPosterCanInlineEditContent">
12+
<annotations>
13+
<features value="PageBuilder"/>
14+
<stories value="Slider"/>
15+
<title value="Collage Right - Can Inline Edit Slide Content"/>
16+
<description value="Verify that users are able to inline edit a collage right Slide's content from the stage"/>
17+
<severity value="MAJOR"/>
18+
<useCaseId value="MC-937"/>
19+
<testCaseId value="MC-3850"/>
20+
<group value="pagebuilder"/>
21+
<group value="pagebuilder-slide"/>
22+
<group value="pagebuilder-slideItemCollageRight"/>
23+
</annotations>
24+
<actionGroup ref="chooseVisualSelectOption" after="dragSliderIntoStage" stepKey="enterAppearancePropertyExtended">
25+
<argument name="property" value="PageBuilderAppearance_CollageRight"/>
26+
</actionGroup>
27+
<actionGroup ref="saveEditPanelSettings" stepKey="closeEditPanelSettings"/>
28+
</test>
1129
<test name="SlideCollageRightMobileWithMobileImageValues" extends="SlideCollageCenteredMobileWithMobileImageValues">
1230
<annotations>
1331
<features value="PageBuilder"/>

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

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,105 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="SlideItemPosterCanInlineEditContent">
12+
<annotations>
13+
<features value="PageBuilder"/>
14+
<stories value="Slider"/>
15+
<title value="Poster - Can Inline Edit Slide Content"/>
16+
<description value="Verify that users are able to inline edit a poster Slide's content from the stage"/>
17+
<severity value="MAJOR"/>
18+
<useCaseId value="MC-937"/>
19+
<testCaseId value="MC-3813"/>
20+
<group value="pagebuilder"/>
21+
<group value="pagebuilder-slide"/>
22+
<group value="pagebuilder-slideItemPoster"/>
23+
</annotations>
24+
<before>
25+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
26+
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
27+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
28+
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
29+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
30+
</before>
31+
<after>
32+
<actionGroup ref="logout" stepKey="logout"/>
33+
</after>
34+
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
35+
<argument name="contentType" value="PageBuilderSliderContentType"/>
36+
</actionGroup>
37+
<!-- Add Slider -->
38+
<comment userInput="Add Slider" stepKey="commentAddSlider"/>
39+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
40+
<argument name="group" value="PageBuilderSliderContentType"/>
41+
</actionGroup>
42+
<actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragSliderIntoStage">
43+
<argument name="contentType" value="PageBuilderSliderContentType"/>
44+
</actionGroup>
45+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
46+
<!-- Inline Edit Slide Content -->
47+
<comment userInput="Inline Edit Slide Content" stepKey="commentInlineEdit"/>
48+
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEdit">
49+
<argument name="contentType" value="PageBuilderSliderContentType"/>
50+
<argument name="content" value="{{PageBuilderSlideItemContent_Slide1.value}}"/>
51+
</actionGroup>
52+
<!-- Validate Edit Panel -->
53+
<comment userInput="Validate Edit Panel" stepKey="commentValidateEditPanel"/>
54+
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditMenuOnStage">
55+
<argument name="section" value="SlideOnBackend"/>
56+
</actionGroup>
57+
<actionGroup ref="validateTextInTinyMCE" stepKey="seeMessageText">
58+
<argument name="property" value="PageBuilderSlideItemContent_Slide1"/>
59+
<argument name="section" value="SlideOnConfigurationPanel"/>
60+
</actionGroup>
61+
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings2"/>
62+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
63+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
64+
<!-- Validate Stage After Save -->
65+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage"/>
66+
<seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeMessageContentStage"/>
67+
<!-- Validate Storefront -->
68+
<comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
69+
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
70+
<argument name="contentType" value="PageBuilderSliderContentType"/>
71+
</actionGroup>
72+
<seeElement selector="{{SlideOnFrontend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeMessageContentStorefront"/>
73+
</test>
74+
<test name="SlideItemPosterWYSIWYGDisabledInlineEdit" extends="SlideItemPosterCanInlineEditContent">
75+
<annotations>
76+
<features value="PageBuilder"/>
77+
<stories value="Slider"/>
78+
<title value="Poster - Inline Edit With WYSIWYG Disabled"/>
79+
<description value="Verify that a user can inline edit Slide poster content when WYSIWYG is disabled"/>
80+
<severity value="MAJOR"/>
81+
<useCaseId value="MC-937"/>
82+
<testCaseId value="MC-3813"/>
83+
<group value="pagebuilder"/>
84+
<group value="pagebuilder-slide"/>
85+
<group value="pagebuilder-slideItemPoster"/>
86+
</annotations>
87+
<before>
88+
<remove keyForRemoval="enableWYSIWYG"/>
89+
<remove keyForRemoval="enableTinyMCE4"/>
90+
<magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG" before="loginAsAdmin"/>
91+
</before>
92+
<after>
93+
<magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG" before="logout"/>
94+
</after>
95+
<actionGroup ref="inlineEditTextAreaFromStage" stepKey="inlineEdit">
96+
<argument name="contentType" value="PageBuilderSliderContentType"/>
97+
<argument name="content" value="{{PageBuilderSlideItemContent_Slide1.value}}"/>
98+
</actionGroup>
99+
<executeJS function="return document.querySelector('{{SlideOnConfigurationPanel.textArea}}').value" stepKey="seeMessageText"/>
100+
<assertEquals stepKey="assertTextAreaValueEditPanel" after="seeMessageText">
101+
<expectedResult type="string">{{PageBuilderSlideItemContent_Slide1.value}}</expectedResult>
102+
<actualResult type="variable">seeMessageText</actualResult>
103+
</assertEquals>
104+
<actionGroup ref="assertTextareaContainsValue" stepKey="seeMessageContentStage">
105+
<argument name="selector" value="{{PageBuilderStage.inlineTextAreaEditor(PageBuilderSliderContentType.role, '1')}}"/>
106+
<argument name="value" value="{{PageBuilderSlideItemContent_Slide1.value}}"/>
107+
</actionGroup>
108+
<seeElement selector="{{SlideOnFrontend.messageContentTextArea('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeMessageContentStorefront"/>
109+
</test>
11110
<test name="SlideItemPosterButtonNeverShow">
12111
<annotations>
13112
<features value="PageBuilder"/>
@@ -433,6 +532,7 @@
433532
<seeElementInDOM selector="{{SlideOnBackend.editableButtonItemElement('1')}}" stepKey="seeButtonIsEditable"/>
434533
<click selector="{{SlideOnBackend.editableButtonItemElement('1')}}" stepKey="clickButtonToEdit"/>
435534
<pressKey selector="{{SlideOnBackend.editableButtonItemElement('1')}}" userInput="{{PageBuilderSlideItemButtonText_Common2.value}}" stepKey="enterButtonText"/>
535+
<waitForPageLoad stepKey="waitForPageLoad"/>
436536
<actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">
437537
<argument name="section" value="SlideOnBackend"/>
438538
</actionGroup>

0 commit comments

Comments
 (0)