Skip to content

Commit 6409969

Browse files
dhaeckerdhaecker
committed
PB-266: Video background for Slide
- Fixing MFTF slide selectors - Fixing MFTF block tests for banner & slide - Fixing MFTF inline editing for slides
1 parent 068acfd commit 6409969

12 files changed

+376
-301
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@
424424
</actionGroup>
425425
<actionGroup name="validateVideoBackgroundLoadedButNotPlayingForNotVisibleElement" extends="validateVideoBackgroundPlaying">
426426
<annotations>
427-
<description>Validates that the video in the video background is loaded but not playing for not visible element.</description>
427+
<description>Validates that the video in the video background is loaded but not playing for an element that is not visible.</description>
428428
</annotations>
429429
<waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
430430
<assertNotContains stepKey="assertVideoPlaying">

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

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@
235235
<waitForElement selector="{{MediaGallerySection.StorageRootArrowClicked}}" stepKey="waitForStorageRootArrowClicked"/>
236236
</actionGroup>
237237
<actionGroup name="inlineEditWYSIWYGFromStage">
238+
<annotations>
239+
<description>Edits content in the inline wysiwyg editor on the stage in a content type.</description>
240+
</annotations>
238241
<arguments>
239242
<argument name="contentType"/>
240243
<argument name="content" type="string"/>
@@ -246,18 +249,11 @@
246249
<waitForPageLoad stepKey="waitForPageLoad"/>
247250
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
248251
</actionGroup>
249-
<actionGroup name="inlineEditWYSIWYGSWithVideoFromStage">
250-
<arguments>
251-
<argument name="contentType"/>
252-
<argument name="content" type="string"/>
253-
<argument name="index" defaultValue="1" type="string"/>
254-
</arguments>
255-
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
256-
<click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea1"/>
257-
<waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
258-
<pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
259-
<waitForPageLoad stepKey="waitForPageLoad"/>
260-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
252+
<actionGroup name="doubleClickToInlineEditWYSIWYGFromStage" extends="inlineEditWYSIWYGFromStage">
253+
<annotations>
254+
<description>Edits content in the inline wysiwyg editor on the stage in a content type. Used when a single click does not initialize the editor.</description>
255+
</annotations>
256+
<doubleClick selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
261257
</actionGroup>
262258
<actionGroup name="inlineEditTextAreaFromStage">
263259
<arguments>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<element name="overlay" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//div[@data-element='overlay']" parameterized="true"/>
9696
<element name="overlayJS" type="button" selector="document.querySelectorAll('[data-content-type=banner] div.pagebuilder-overlay')[{{overlayIndex}} - 1]" parameterized="true"/>
9797
<element name="emptyBanner" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//div[contains(@class,'placeholder-text') and .='Edit Banner Text']" parameterized="true"/>
98-
<element name="editableButtonOnStage" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//a//span[@contenteditable='true']" parameterized="true"/>
98+
<element name="editableButtonItemElement" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//a//span[@contenteditable='true']" parameterized="true"/>
9999
<element name="wysiwygLinkUrl" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//a[@href='{{link}}']" parameterized="true"/>
100100
<element name="imageOnStage" type="text" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]//img[contains(@src,'{{image}}')]" parameterized="true"/>
101101
<element name="imageSourceByIndex" type="text" selector="(//div[@data-content-type='banner'])[{{bannerIndex}}]/div[contains(@style,'{{image}}')]" parameterized="true"/>

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@
174174
<element name="noCollageMinimumHeight" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[not(contains(@style,'min-height:'))]" parameterized="true"/>
175175
<!-- Background Configuration -->
176176
<element name="backgroundType" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-background-type='{{backgroundType}}']"/>
177-
<element name="backgroundColorElement" type="button" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@style,'background-color:')]"/>
178-
<element name="backgroundColor" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'background-color: {{backgroundColor}};')]" parameterized="true"/>
179-
<element name="noBackgroundColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[not(contains(@style,'background-color:'))]" parameterized="true"/>
180-
<element name="backgroundImage" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'background-image: url(') and contains(@style,'{{backgroundImage}}')]" parameterized="true"/>
181-
<element name="noBackgroundImage" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[not(contains(@style,'background-image:'))]" parameterized="true"/>
182-
<element name="backgroundPosition" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'background-position: {{backgroundPosition}};')]" parameterized="true"/>
183-
<element name="backgroundSize" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'background-size: {{backgroundSize}};')]" parameterized="true"/>
184-
<element name="backgroundRepeat" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'background-repeat: {{backgroundRepeat}};')]" parameterized="true"/>
185-
<element name="backgroundAttachment" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'background-attachment: {{backgroundAttachment}};')]" parameterized="true"/>
177+
<element name="backgroundColorElement" type="button" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-color:')]"/>
178+
<element name="backgroundColor" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-color: {{backgroundColor}};')]" parameterized="true"/>
179+
<element name="noBackgroundColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][not(contains(@style,'background-color:'))]" parameterized="true"/>
180+
<element name="backgroundImage" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-image: url(') and contains(@style,'{{backgroundImage}}')]" parameterized="true"/>
181+
<element name="noBackgroundImage" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][not(contains(@style,'background-image:'))]" parameterized="true"/>
182+
<element name="backgroundPosition" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-position: {{backgroundPosition}};')]" parameterized="true"/>
183+
<element name="backgroundSize" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-size: {{backgroundSize}};')]" parameterized="true"/>
184+
<element name="backgroundRepeat" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-repeat: {{backgroundRepeat}};')]" parameterized="true"/>
185+
<element name="backgroundAttachment" type="button" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'background-attachment: {{backgroundAttachment}};')]" parameterized="true"/>
186186
<!-- Video Background -->
187187
<element name="videoBackgroundJarallaxContainer" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]"/>
188188
<element name="videoBackgroundVideoElement" type="text" parameterized="true" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//iframe|(//div[@data-content-type='slide'])[{{slideIndex}}]//div[contains(@id,'jarallax-container')]//video"/>
@@ -212,23 +212,23 @@
212212
<!-- Advanced Configuration -->
213213
<element name="posterAlignment" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'text-align: {{alignment}};')]" parameterized="true"/>
214214
<element name="posterNoAlignment" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][not(contains(@style,'text-align:'))]" parameterized="true"/>
215-
<element name="collageAlignment" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'text-align: {{alignment}};')]" parameterized="true"/>
216-
<element name="collageNoAlignment" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[not(contains(@style,'text-align:'))]" parameterized="true"/>
215+
<element name="collageAlignment" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'text-align: {{alignment}};')]" parameterized="true"/>
216+
<element name="collageNoAlignment" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][not(contains(@style,'text-align:'))]" parameterized="true"/>
217217
<element name="posterBorder" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'border-style: {{border}};')]" parameterized="true"/>
218-
<element name="collageBorder" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'border-style: {{borderStyle}};')]" parameterized="true"/>
218+
<element name="collageBorder" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'border-style: {{borderStyle}};')]" parameterized="true"/>
219219
<element name="posterBorderColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'border-color: {{borderColor}};')]" parameterized="true"/>
220220
<element name="posterNoBorderColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][not(contains(@style,'border-color:'))]" parameterized="true"/>
221-
<element name="collageBorderColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'border-color: {{borderColor}};')]" parameterized="true"/>
222-
<element name="collageNoBorderColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[not(contains(@style,'border-color:'))]" parameterized="true"/>
221+
<element name="collageBorderColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'border-color: {{borderColor}};')]" parameterized="true"/>
222+
<element name="collageNoBorderColor" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][not(contains(@style,'border-color:'))]" parameterized="true"/>
223223
<element name="posterBorderWidth" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'border-width: {{borderWidth}}px;')]" parameterized="true"/>
224-
<element name="collageBorderWidth" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'border-width: {{borderWidth}}px;')]" parameterized="true"/>
224+
<element name="collageBorderWidth" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'border-width: {{borderWidth}}px;')]" parameterized="true"/>
225225
<element name="posterBorderRadius" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'border-radius: {{borderRadius}}px;')]" parameterized="true"/>
226-
<element name="collageBorderRadius" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'border-radius: {{borderRadius}}px;')]" parameterized="true"/>
226+
<element name="collageBorderRadius" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'border-radius: {{borderRadius}}px;')]" parameterized="true"/>
227227
<element name="cssClasses" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}][contains(@class,'{{cssClasses}}')]" parameterized="true"/>
228228
<element name="posterMargins" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'margin: {{margins}}px;')]" parameterized="true"/>
229-
<element name="collageMargins" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'margin: {{margins}}px;')]" parameterized="true"/>
229+
<element name="collageMargins" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'margin: {{margins}}px;')]" parameterized="true"/>
230230
<element name="posterPadding" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='overlay'][contains(@style,'padding: {{padding}}px;')]" parameterized="true"/>
231-
<element name="collagePadding" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]/div[contains(@style,'padding: {{padding}}px;')]" parameterized="true"/>
231+
<element name="collagePadding" type="text" selector="(//div[@data-content-type='slide'])[{{slideIndex}}]//div[@data-element='wrapper'][contains(@style,'padding: {{padding}}px;')]" parameterized="true"/>
232232
</section>
233233
<section name="SlideOnConfigurationPanel">
234234
<element name="textArea" type="text" selector="#pagebuilder_slide_form_content"/>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -650,9 +650,9 @@
650650
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
651651
<!-- Validate Stage -->
652652
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
653-
<seeElementInDOM selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="seeButtonIsEditable"/>
654-
<click selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="clickButtonToEdit"/>
655-
<pressKey selector="{{BannerOnBackend.editableButtonOnStage('1')}}" userInput="{{PageBuilderButtonItemText_Common2.value}}" stepKey="enterButtonText"/>
653+
<seeElementInDOM selector="{{BannerOnBackend.editableButtonItemElement('1')}}" stepKey="seeButtonIsEditable"/>
654+
<click selector="{{BannerOnBackend.editableButtonItemElement('1')}}" stepKey="clickButtonToEdit"/>
655+
<pressKey selector="{{BannerOnBackend.editableButtonItemElement('1')}}" userInput="{{PageBuilderButtonItemText_Common2.value}}" stepKey="enterButtonText"/>
656656
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
657657
<argument name="contentType" value="PageBuilderBannerContentType"/>
658658
</actionGroup>
@@ -1286,15 +1286,15 @@
12861286
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
12871287
<!-- Validate Stage -->
12881288
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
1289-
<waitForElementVisible selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="waitForButtonIsEditable"/>
1290-
<click selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="clickButtonToEdit"/>
1291-
<pressKey selector="{{BannerOnBackend.editableButtonOnStage('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="enterButtonText"/>
1292-
<see selector="{{BannerOnBackend.editableButtonOnStage('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStageNBSPBannerButtonText"/>
1289+
<waitForElementVisible selector="{{BannerOnBackend.editableButtonItemElement('1')}}" stepKey="waitForButtonIsEditable"/>
1290+
<click selector="{{BannerOnBackend.editableButtonItemElement('1')}}" stepKey="clickButtonToEdit"/>
1291+
<pressKey selector="{{BannerOnBackend.editableButtonItemElement('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="enterButtonText"/>
1292+
<see selector="{{BannerOnBackend.editableButtonItemElement('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStageNBSPBannerButtonText"/>
12931293
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
12941294
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
12951295
<!-- Validate Stage After Save-->
12961296
<comment userInput="Validate Stage After Save" stepKey="commentValidateStageAfterSave"/>
1297-
<see selector="{{BannerOnBackend.editableButtonOnStage('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStageNBSPBannerButtonTextAfterSave"/>
1297+
<see selector="{{BannerOnBackend.editableButtonItemElement('1')}}" userInput="{{PageBuilderBannerButtonTextProperty_Non_Breaking_Space.value}}" stepKey="seeStageNBSPBannerButtonTextAfterSave"/>
12981298
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
12991299
<argument name="contentType" value="PageBuilderBannerContentType"/>
13001300
</actionGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,9 @@
705705
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusEditor"/>
706706
<!-- Validate Stage -->
707707
<comment userInput="Validate Stage" stepKey="commentValidateStage"/>
708-
<seeElementInDOM selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="seeButtonIsEditable"/>
709-
<click selector="{{BannerOnBackend.editableButtonOnStage('1')}}" stepKey="clickButtonToEdit"/>
710-
<pressKey selector="{{BannerOnBackend.editableButtonOnStage('1')}}" userInput="{{PageBuilderButtonItemText_Common2.value}}" stepKey="enterButtonText"/>
708+
<seeElementInDOM selector="{{BannerOnBackend.editableButtonItemElement('1')}}" stepKey="seeButtonIsEditable"/>
709+
<click selector="{{BannerOnBackend.editableButtonItemElement('1')}}" stepKey="clickButtonToEdit"/>
710+
<pressKey selector="{{BannerOnBackend.editableButtonItemElement('1')}}" userInput="{{PageBuilderButtonItemText_Common2.value}}" stepKey="enterButtonText"/>
711711
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
712712
<argument name="contentType" value="PageBuilderBannerContentType"/>
713713
</actionGroup>

0 commit comments

Comments
 (0)