Skip to content

Commit 97b0629

Browse files
dhaeckerdhaecker
committed
MC-13769: Add Missing P0-P1 MFTF Tests For PageBuilder On CMS Block - Render Content Through Block
 - Fixing banner tests rendered through block with different wysiwyg configs - Updating/Adding supporting sections, actiongroups - Updating tests affected by changes
1 parent ba20dcd commit 97b0629

File tree

5 files changed

+240
-243
lines changed

5 files changed

+240
-243
lines changed

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,4 @@
1414
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
1515
<waitForPageLoad stepKey="waitForAnimation"/>
1616
</actionGroup>
17-
<actionGroup name="focusOnTextInlineTinyMCEEditor">
18-
<arguments>
19-
<argument name="index" defaultValue="1" type="string"/>
20-
</arguments>
21-
<comment userInput="focusOnTextInlineTinyMCEEditor" stepKey="comment"/>
22-
<waitForElementVisible selector="{{TextOnStage.tinymce(index)}}" stepKey="waitForEditor"/>
23-
<click selector="{{TextOnStage.tinymce(index)}}" stepKey="clickEditor"/>
24-
<waitForPageLoad stepKey="waitForEditorToBeFocused"/>
25-
<waitForElementVisible selector="{{TextOnStage.tinymceInFocus(index)}}" stepKey="waitForEditorFocused"/>
26-
</actionGroup>
27-
<actionGroup name="focusOnTextInlineTextArea">
28-
<arguments>
29-
<argument name="index" defaultValue="1" type="string"/>
30-
</arguments>
31-
<comment userInput="focusOnTextInlineTextArea" stepKey="comment"/>
32-
<waitForElementVisible selector="{{TextOnStage.textArea(index)}}" stepKey="waitForEditor"/>
33-
<click selector="{{TextOnStage.textArea(index)}}" stepKey="clickEditor"/>
34-
<waitForPageLoad stepKey="waitForEditorToBeFocused"/>
35-
</actionGroup>
3617
</actionGroups>

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

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -113,30 +113,6 @@
113113
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
114114
<waitForElementVisible selector="{{section.imageSourceByIndex(index, property.fileName)}}" stepKey="waitForMainImageSource1"/>
115115
</actionGroup>
116-
<actionGroup name="inlineEditWYSIWYGFromStage">
117-
<arguments>
118-
<argument name="contentType"/>
119-
<argument name="content" type="string"/>
120-
<argument name="index" defaultValue="1" type="string"/>
121-
</arguments>
122-
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
123-
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
124-
<pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
125-
<waitForPageLoad stepKey="waitForPageLoad"/>
126-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
127-
</actionGroup>
128-
<actionGroup name="inlineEditTextAreaFromStage">
129-
<arguments>
130-
<argument name="contentType"/>
131-
<argument name="content" type="string"/>
132-
<argument name="index" defaultValue="1" type="string"/>
133-
</arguments>
134-
<click selector="{{PageBuilderStage.inlineTextAreaEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
135-
<waitForPageLoad stepKey="waitForPageLoad"/>
136-
<fillField selector="{{PageBuilderStage.inlineTextAreaEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
137-
<waitForPageLoad stepKey="waitForPageLoad1"/>
138-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
139-
</actionGroup>
140116
<actionGroup name="verifyUploadImageButtons">
141117
<arguments>
142118
<argument name="contentType"/>
@@ -151,4 +127,25 @@
151127
<seeElement selector="{{section.onHoverUploadImageButton(contentType.role, index)}}" stepKey="seeUploadImageButton" />
152128
<seeElement selector="{{section.onHoverSelectFromGalleryButton(contentType.role, index)}}" stepKey="seeSelectFromGalleryButton"/>
153129
</actionGroup>
130+
<actionGroup name="focusOnInlineTinyMCEEditor">
131+
<arguments>
132+
<argument name="section" defaultValue="TextOnStage"/>
133+
<argument name="index" defaultValue="1" type="string"/>
134+
</arguments>
135+
<comment userInput="focusOnInlineTinyMCEEditor" stepKey="comment"/>
136+
<waitForElementVisible selector="{{section.tinymce(index)}}" stepKey="waitForEditor"/>
137+
<click selector="{{section.tinymce(index)}}" stepKey="clickEditor"/>
138+
<waitForPageLoad stepKey="waitForEditorToBeFocused"/>
139+
<waitForElementVisible selector="{{section.tinymceInFocus(index)}}" stepKey="waitForEditorFocused"/>
140+
</actionGroup>
141+
<actionGroup name="focusOnInlineTextAreaEditor">
142+
<arguments>
143+
<argument name="section" defaultValue="TextOnStage"/>
144+
<argument name="index" defaultValue="1" type="string"/>
145+
</arguments>
146+
<comment userInput="focusOnInlineTextAreaEditor" stepKey="comment"/>
147+
<waitForElementVisible selector="{{section.textArea(index)}}" stepKey="waitForEditor"/>
148+
<click selector="{{section.textArea(index)}}" stepKey="clickEditor"/>
149+
<waitForPageLoad stepKey="waitForEditorToBeFocused"/>
150+
</actionGroup>
154151
</actionGroups>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,28 @@
201201
<waitForPageLoad stepKey="waitForPageLoad2"/>
202202
<waitForElement selector="{{MediaGallerySection.StorageRootArrowClicked}}" stepKey="waitForStorageRootArrowClicked"/>
203203
</actionGroup>
204+
<actionGroup name="inlineEditWYSIWYGFromStage">
205+
<arguments>
206+
<argument name="contentType"/>
207+
<argument name="content" type="string"/>
208+
<argument name="index" defaultValue="1" type="string"/>
209+
</arguments>
210+
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
211+
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
212+
<pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
213+
<waitForPageLoad stepKey="waitForPageLoad"/>
214+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
215+
</actionGroup>
216+
<actionGroup name="inlineEditTextAreaFromStage">
217+
<arguments>
218+
<argument name="contentType"/>
219+
<argument name="content" type="string"/>
220+
<argument name="index" defaultValue="1" type="string"/>
221+
</arguments>
222+
<click selector="{{PageBuilderStage.inlineTextAreaEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
223+
<waitForPageLoad stepKey="waitForPageLoad"/>
224+
<fillField selector="{{PageBuilderStage.inlineTextAreaEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
225+
<waitForPageLoad stepKey="waitForPageLoad1"/>
226+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
227+
</actionGroup>
204228
</actionGroups>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@
3838
<element name="contentJS" type="text" selector="document.querySelectorAll('[data-content-type=banner] [data-element=content]')[{{arg1}} - 1]" parameterized="true"/>
3939
<element name="messageContent" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content']//*[contains(.,'{{arg2}}')]" parameterized="true"/>
4040
<element name="noMessageContent" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][.='Edit Banner Text'][not(*)]" parameterized="true"/>
41-
<element name="messageContentTextArea" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][.='{{arg2}}']" parameterized="true"/>
41+
<element name="messageContentTextArea" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content'][contains(text(),'{{arg2}}')]" parameterized="true"/>
4242
<element name="messageContentTextAreaImage" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='wrapper']//div[@data-element='content']//img[contains(@src, {{arg2}})]" parameterized="true"/>
4343
<element name="messageContentTextAreaTextWidget" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='content']//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
4444
<element name="messageContentText" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='content']//*[contains(text(),'{{arg2}}')]" parameterized="true"/>
45+
<element name="messageContentWidget" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='content']//a[contains(@href,'{{arg2}}{{arg3}}')]" parameterized="true"/>
4546
<element name="messageContentHeightJS" type="text" selector="return document.evaluate(&quot;(//div[@data-content-type='banner'])[{{arg1}}]//div[@data-element='content']//div[contains(text(),'{{arg2}}')]&quot;, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue.clientHeight;" parameterized="true"/>
4647
<element name="linkUrl" type="button" selector="(//div[@data-content-type='banner'])[{{arg1}}]/a[@data-element='link'][contains(@href,'{{arg2}}')]" parameterized="true"/>
4748
<element name="openInNewTab" type="button" selector="(//div[@data-content-type='banner'])[{{arg1}}]/a[@data-element='link'][contains(@target,'_blank')]" parameterized="true"/>
@@ -89,6 +90,7 @@
8990
<element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{arg}}]//*[contains(@class, 'magento-variable magento-placeholder')]" parameterized="true"/>
9091
<element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{arg}}]//*[contains(@class, 'magento-placeholder magento-widget')]" parameterized="true"/>
9192
<element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
93+
<element name="tinymceInFocus" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg') and contains(@class, 'mce-edit-focus')]" parameterized="true"/>
9294
<!-- Appearance Configuration -->
9395
<element name="appearance" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}][@data-appearance='{{arg2}}']" parameterized="true"/>
9496
<element name="posterMinimumHeight" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and @data-element='main'])[{{arg1}}]//div[@data-element='overlay'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>

0 commit comments

Comments
 (0)