Skip to content

Commit d865397

Browse files
Merge pull request #674 from petrovsa/429_no_default_row
#429: User can add content to the Stage …
2 parents 88fd10a + fe8c4c1 commit d865397

File tree

25 files changed

+346
-1
lines changed

25 files changed

+346
-1
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotDragContentTypeToTargetActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
<argument name="dropZoneIndex" defaultValue="1" type="string"/>
1717
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
1818
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
19+
<argument name="contentSection" defaultValue="PageBuilderStage.editButtonSelector"/>
1920
</arguments>
20-
<scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
21+
<scrollTo selector="{{contentSection}}" stepKey="scrollToTopOfStage"/>
2122
<waitForElement time="30" selector="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" stepKey="waitForTargetActive"/>
2223
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dragContentTypeIntoTarget"/>
2324
<waitForPageLoad time="30" stepKey="waitForAnimation"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="BannerOnBackend">
10+
<element name="allBanners" type="button" selector="[data-content-type='banner']"/>
1011
<element name="base" type="button" selector="(//div[contains(@class,&quot;pagebuilder-banner&quot;) and contains(@class,&quot;pagebuilder-content-type&quot;)])[{{bannerIndex}}]" parameterized="true"/>
1112
<element name="baseCSS" type="button" selector=".pagebuilder-banner.pagebuilder-content-type"/>
1213
<element name="hidden" type="button" selector="(//div[contains(@class,'pagebuilder-banner') and contains(@class,'pagebuilder-content-type')])[{{bannerIndex}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="BannerOnFrontend">
10+
<element name="allBanners" type="button" selector="[data-content-type='banner']"/>
1011
<element name="base" type="button" selector="(//div[@data-content-type=&quot;banner&quot;])[{{bannerIndex}}]" parameterized="true"/>
1112
<element name="baseCSS" type="button" selector="[data-content-type=banner]"/>
1213
<element name="baseJS" type="button" selector="document.querySelectorAll('[data-content-type=banner] div.pagebuilder-banner-wrapper')[{{wrapperIndex}} - 1]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStageSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="BlockOnStage">
1111
<element name="html" type="text" selector="((//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//div[contains(@data-bind,'html: data.main.html')])[{{arg2}}]//div[contains(@class,'placeholder-html-code')]" parameterized="true"/>
12+
<element name="allBlocks" type="text" selector="[data-content-type='block']"/>
1213
<element name="status" type="text" selector="((//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//span[contains(@class,'placeholder') and text()='{{arg}}'])" parameterized="true"/>
1314
<element name="deleted" type="text" selector="((//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//span[contains(@class,'placeholder') and contains(text(),'Block with ID: {{arg}} doesn')])" parameterized="true"/>
1415
<element name="title" type="text" selector="(//div[contains(@class,'pagebuilder-block')])[{{arg1}}]//div[contains(@class,'pagebuilder-options-wrapper')]//div[contains(@class,'option-title') and text()='{{arg}}']" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStorefrontSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<element name="ancestor" type="text" selector="[ancestor::div[@data-content-type=&quot;block&quot;]]"/>
1212
<element name="html" type="text" selector="(//div[@data-content-type='html'])[{{arg1}}]//a[contains(@class,'pagebuilder-button-primary')]" parameterized="true"/>
1313
<element name="base" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}]" parameterized="true"/>
14+
<element name="allBlocks" type="block" selector="[data-content-type='block']"/>
1415
<element name="baseCSS" type="text" selector="[data-content-type=block]"/>
1516
<element name="hidden" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
1617
<element name="notHidden" type="text" selector="(//div[@data-content-type='block'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStageSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="ButtonGroupOnStage">
11+
<element name="allButtons" type="text" selector="[data-content-type='buttons']"/>
1112
<element name="jsButtonGroupSelector" type="text" selector="document.querySelectorAll('.pagebuilder-buttons')[{{arg1}}-1]" parameterized="true"/>
1213
<element name="base" type="button" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]" parameterized="true"/>
1314
<element name="hidden" type="button" selector="(//div[contains(@class,'pagebuilder-buttons')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStorefrontSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="ButtonGroupOnStorefront">
11+
<element name="allButtons" type="text" selector="[data-content-type='buttons']"/>
1112
<element name="jsButtonGroupSelector" type="text" selector="document.querySelectorAll('div[data-content-type=\'buttons\']')[{{arg1}}-1]" parameterized="true"/>
1213
<element name="base" type="button" selector="(//div[@data-content-type='buttons'])[{{arg1}}]" parameterized="true"/>
1314
<element name="hidden" type="button" selector="(//div[@data-content-type='buttons'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
99
<section name="HeadingOnStorefront">
10+
<element name="all" type="text" selector="[data-content-type='heading']"/>
1011
<element name="base" type="text" selector="(//*[@data-content-type='heading'])[{{arg2}}]" parameterized="true"/>
1112
<element name="baseByTagName" type="text" selector="(//{{arg1}}[@data-content-type='heading'])[{{arg2}}]" parameterized="true"/>
1213
<element name="baseJs" type="text" selector="document.querySelectorAll('[data-content-type=\'heading\']')[{{arg1}}]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStageSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="HtmlOnStage">
11+
<element name="allHtml" type="text" selector="[data-content-type=html]"/>
1112
<element name="base" type="text" selector="(//div[contains(@class,'pagebuilder-html')]//div[contains(@data-bind,'text: data.main.html') or contains(@class,'placeholder-html-empty')])[{{arg1}}]" parameterized="true"/>
1213
<element name="baseCSS" type="text" selector="[data-content-type=html][data-element=main]"/>
1314
<element name="hidden" type="text" selector="(//*[@data-content-type='html'])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStorefrontSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="HtmlOnStorefront">
1111
<element name="base" type="text" selector="(//div[@data-content-type='html'])[{{arg1}}]" parameterized="true"/>
12+
<element name="allHtml" type="block" selector="[data-content-type='html']"/>
1213
<element name="baseCSS" type="text" selector="[data-content-type=html]"/>
1314
<element name="hidden" type="text" selector="(//div[@data-content-type='html'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
1415
<element name="notHidden" type="text" selector="(//div[@data-content-type='html'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>

0 commit comments

Comments
 (0)