Skip to content

Commit d85a104

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'owls/MC-3229-add-missing-p0-p1-mftf-tests-for-video' into cms-team-2-sprint-13
2 parents 5fb4bb3 + 600bb26 commit d85a104

File tree

5 files changed

+401
-41
lines changed

5 files changed

+401
-41
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<arguments>
2929
<argument name="contentType"/>
3030
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
31-
<argument name="contentTypeXCoordinate" defaultValue="10" type="string"/>
32-
<argument name="contentTypeYCoordinate" defaultValue="0" type="string"/>
31+
<argument name="contentTypeXCoordinate" defaultValue="null" type="string"/>
32+
<argument name="contentTypeYCoordinate" defaultValue="null" type="string"/>
3333
</arguments>
3434
<waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
3535
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" x="{{contentTypeXCoordinate}}" y="{{contentTypeYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Data/ContentTypeData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
<data key="name">Video</data>
7474
<data key="section">Media</data>
7575
<data key="role">video</data>
76+
<data key="editPanelName">Video</data>
7677
<data key="pageNamePrefix">video</data>
7778
</entity>
7879
<entity name="PageBuilderSliderContentType" type="pagebuilder_content_type">

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="VideoOnStage">
1212
<!-- Empty Video -->
13-
<element name="empty" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//iframe" parameterized="true"/>
14-
<element name="iframe" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//iframe" parameterized="true"/>
15-
<element name="icon" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//i[contains(@class,'icon-pagebuilder-video')]" parameterized="true"/>
16-
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//span[.='{{arg2}}']" parameterized="true"/>
13+
<element name="empty" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//iframe" parameterized="true"/>
14+
<element name="iframe" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//iframe" parameterized="true"/>
15+
<element name="icon" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//i[contains(@class,'icon-pagebuilder-video')]" parameterized="true"/>
16+
<element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//span[.='{{arg2}}']" parameterized="true"/>
1717
<!-- General Configuration -->
18-
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]" parameterized="true"/>
19-
<element name="source" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//iframe[@src='{{arg2}}']" parameterized="true"/>
20-
<element name="width" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@style,'max-width: {{arg2}}px;')]" parameterized="true"/>
21-
<element name="noWidth" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[not(starts-with(@style,'width:')) and not(contains(@style,' width:'))][contains(@class,'pagebuilder-video-wrapper')]" parameterized="true"/>
18+
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]" parameterized="true"/>
19+
<element name="source" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//iframe[@src='{{arg2}}']" parameterized="true"/>
20+
<element name="width" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'max-width: {{arg2}}px;')]" parameterized="true"/>
21+
<element name="noWidth" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))][contains(@class,'pagebuilder-video-wrapper')]" parameterized="true"/>
2222
<!-- Advanced Configuration -->
23-
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@style, 'justify-content: {{arg2}};')]" parameterized="true"/>
24-
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[not(contains(@style,'justify-content:'))]" parameterized="true"/>
25-
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
26-
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
27-
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[not(contains(@style,'border-color:'))]" parameterized="true"/>
28-
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
29-
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
30-
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@class,'{{arg2}}')]" parameterized="true"/>
31-
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]" parameterized="true"/>
32-
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
33-
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}]//div[contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
23+
<element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[contains(@style, 'justify-content: {{arg2}};')]" parameterized="true"/>
24+
<element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[not(contains(@style,'justify-content:'))]" parameterized="true"/>
25+
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
26+
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
27+
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
28+
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
29+
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
30+
<element name="cssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]/parent::div[contains(@class,'{{arg2}}')]" parameterized="true"/>
31+
<element name="noCssClasses" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]" parameterized="true"/>
32+
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
33+
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
3434
</section>
3535
<section name="VideoOnStorefront">
3636
<!-- Empty Video -->
@@ -39,19 +39,19 @@
3939
<element name="base" type="text" selector="(//div[@data-role='video']//iframe)[{{arg1}}]" parameterized="true"/>
4040
<element name="iframe" type="text" selector="(//div[@data-role='video']//iframe)[{{arg1}}]" parameterized="true"/>
4141
<element name="source" type="text" selector="(//div[@data-role='video']//iframe)[{{arg1}}][@src='{{arg2}}']" parameterized="true"/>
42-
<element name="width" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}][contains(@style,'max-width: {{arg2}}')]" parameterized="true"/>
42+
<element name="width" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'max-width: {{arg2}}')]" parameterized="true"/>
4343
<element name="noWidth" type="text" selector="(//div[@data-role='video']//iframe)[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
4444
<!-- Advanced Configuration -->
4545
<element name="alignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@style,'justify-content: {{arg2}};')]" parameterized="true"/>
4646
<element name="noAlignment" type="text" selector="(//div[@data-role='video'])[{{arg1}}][not(contains(@style,'justify-content'))]" parameterized="true"/>
47-
<element name="border" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
48-
<element name="borderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
49-
<element name="noBorderColor" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}][not(contains(@style,'border-color:'))]" parameterized="true"/>
50-
<element name="borderWidth" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
51-
<element name="borderRadius" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
47+
<element name="border" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-style: {{arg2}};')]" parameterized="true"/>
48+
<element name="borderColor" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-color: {{arg2}};')]" parameterized="true"/>
49+
<element name="noBorderColor" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][not(contains(@style,'border-color:'))]" parameterized="true"/>
50+
<element name="borderWidth" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-width: {{arg2}}px;')]" parameterized="true"/>
51+
<element name="borderRadius" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'border-radius: {{arg2}}px;')]" parameterized="true"/>
5252
<element name="cssClasses" type="text" selector="(//div[@data-role='video'])[{{arg1}}][contains(@class,'{{arg2}}')]" parameterized="true"/>
5353
<element name="noCssClasses" type="text" selector="(//div[@data-role='video'])[{{arg1}}][not(@class)]" parameterized="true"/>
54-
<element name="margins" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
55-
<element name="padding" type="text" selector="(//div[contains(@class,'pagebuilder-video')])[{{arg1}}][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
54+
<element name="margins" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'margin: {{arg2}}px;')]" parameterized="true"/>
55+
<element name="padding" type="text" selector="(//div[@data-role='video'])[{{arg1}}]//div[@data-element='wrapper'][contains(@style,'padding: {{arg2}}px;')]" parameterized="true"/>
5656
</section>
5757
</sections>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -522,11 +522,6 @@
522522
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
523523
<argument name="contentType" value="PageBuilderNewsletterContentType"/>
524524
</actionGroup>
525-
<actionGroup ref="validateContentTypeInsideContainerStorefront" stepKey="checkContentTypeInContainerStorefront">
526-
<argument name="contentType" value="PageBuilderNewsletterContentType"/>
527-
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
528-
<argument name="contentTypeIndex" value="1"/>
529-
<argument name="containerTargetIndex" value="2"/>
530-
</actionGroup>
525+
<waitForElementVisible time="30" selector="(//div[@data-role='column'])[2]//div[contains(@class,'pagebuilder-newsletter')]" stepKey="waitForContentTypeStorefront"/>
531526
</test>
532527
</tests>

0 commit comments

Comments
 (0)