Skip to content

Commit 6d47ca5

Browse files
bluemwhitewbluemwhitew
committed
Merge from develop 
2 parents 36ca129 + 7ef5f37 commit 6d47ca5

File tree

657 files changed

+1136
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

657 files changed

+1136
-110
lines changed

‎app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Magento\Framework\Exception\NoSuchEntityException;
1717
use Magento\PageBuilder\Model\Config as PageBuilderConfig;
1818
use Magento\PageBuilder\Model\State as PageBuilderState;
19-
use \Magento\PageBuilder\Model\Stage\Config as Config;
19+
use Magento\PageBuilder\Model\Stage\Config as Config;
2020

2121
/**
2222
* Updates wysiwyg element with Page Builder specific config
@@ -79,7 +79,7 @@ public function __construct(
7979
$data['config']['component'] = 'Magento_PageBuilder/js/form/element/wysiwyg';
8080

8181
// Override the templates to include our KnockoutJS code
82-
$data['config']['template'] = 'Magento_PageBuilder/form/element/wysiwyg';
82+
$data['config']['template'] = 'ui/form/field';
8383
$data['config']['elementTmpl'] = 'Magento_PageBuilder/form/element/wysiwyg';
8484
$wysiwygConfigData = $stageConfig->getConfig();
8585

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/SwitchToPageBuilderStageActionGroup.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,17 @@
1111
<arguments>
1212
<argument name="sectionSelector" defaultValue="{{CmsNewPagePageContentSection.header}}" type="string"/>
1313
<argument name="sectionDependentSelector" defaultValue="{{CmsNewPagePageContentSection.header}}._show" type="string"/>
14+
<argument name="snapshotSelector" defaultValue="{{PageBuilderStage.snapshot}}" type="string"/>
15+
<argument name="editButtonSelector" defaultValue="{{PageBuilderStage.editButtonSelector}}" type="string"/>
1416
<argument name="rowIndex" defaultValue="1" type="string"/>
1517
</arguments>
1618
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
1719
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
1820
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
21+
<waitForElementVisible time="30" selector="{{snapshotSelector}}" stepKey="waitForSnapshot"/>
22+
<waitForElementVisible time="30" selector="{{editButtonSelector}}" stepKey="waitForEditButton"/>
23+
<click selector="{{editButtonSelector}}" stepKey="clickEditButton"/>
24+
<waitForPageLoad stepKey="waitForFullScreenAnimation"/>
1925
<!-- Wait for the first row to be added into the stage for it to be "ready" -->
2026
<waitForElementNotVisible selector="{{PageBuilderStage.stageLoading}}" stepKey="waitForStageLoadingGraphicNotVisible"/>
2127
<waitForElementVisible time="30" selector="{{RowOnStage.base(rowIndex)}}" stepKey="waitForPageBuilderRow"/>

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/SwitchToPageBuilderStageCMSBlockActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="switchToPageBuilderStage">
11+
<arguments>
12+
<argument name="sectionSelector" defaultValue="{{CmsNewPagePageContentSection.header}}" type="string"/>
13+
<argument name="sectionDependentSelector" defaultValue="{{CmsNewPagePageContentSection.header}}._show" type="string"/>
14+
<argument name="rowIndex" defaultValue="1" type="string"/>
15+
</arguments>
16+
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
17+
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
18+
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
19+
<!-- Wait for the first row to be added into the stage for it to be "ready" -->
20+
<waitForElementNotVisible selector="{{PageBuilderStage.stageLoading}}" stepKey="waitForStageLoadingGraphicNotVisible"/>
21+
<waitForElementVisible time="30" selector="{{RowOnStage.base(rowIndex)}}" stepKey="waitForPageBuilderRow"/>
22+
</actionGroup>
23+
</actionGroups>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
<annotations>
1212
<description>Validates all video background attributes when all attributes are configured and parallax is enabled. Extends: validateVideoBackgroundWithAllAttributes</description>
1313
</annotations>
14+
<arguments>
15+
<argument name="expectedPosition" defaultValue="position: fixed;" type="string"/>
16+
</arguments>
1417
<assertStringContainsString stepKey="assertVideoPosition">
15-
<expectedResult type="string">position: fixed;</expectedResult>
18+
<expectedResult type="string">{{expectedPosition}}</expectedResult>
1619
<actualResult type="variable">$videoStyle</actualResult>
1720
</assertStringContainsString>
1821
<assertStringContainsString stepKey="assertImagePosition">
19-
<expectedResult type="string">position: fixed;</expectedResult>
22+
<expectedResult type="string">{{expectedPosition}}</expectedResult>
2023
<actualResult type="variable">$fallbackImageStyle</actualResult>
2124
</assertStringContainsString>
2225
</actionGroup>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="ScrollToActionGroup">
11+
<annotations>
12+
<description>Scroll to element inside Page Builder stage using CSS selector</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="cssSelector" type="string"/>
16+
<argument name="index" defaultValue="1" type="string" />
17+
<argument name="verticalOffset" defaultValue="0" type="string"/>
18+
</arguments>
19+
<executeJS function="return document.querySelectorAll('{{cssSelector}}')[{{index}}-1].offsetTop" stepKey="elementPosition"/>
20+
<executeJS function="document.querySelector('{{PageBuilderStage.stageWrapperFullScreen}}').scrollTop = parseInt({$elementPosition} - {{verticalOffset}}, 10)" stepKey="scrollToElement"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<section name="SliderOnStage">
1111
<element name="all" type="button" selector="div[data-content-type=slider]"/>
1212
<element name="base" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]" parameterized="true"/>
13+
<element name="baseCSS" type="button" selector="div.pagebuilder-content-type.pagebuilder-slider"/>
1314
<element name="containerCSS" type="text" selector="[data-content-type=slider] &gt; .slider-container"/>
1415
<element name="hidden" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
1516
<element name="notHidden" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]/parent::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@
1414
<element name="openFullScreen" type="button" selector="//i[@class='icon-pagebuilder-fullscreen']"/>
1515
<element name="exitFullScreen" type="button" selector=".pagebuilder-header .icon-pagebuilder-fullscreen-exit"/>
1616
<element name="stageLoading" type="button" selector="div.pagebuilder-stage-loading"/>
17-
<element name="stageSnapshot" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-wrapper') and contains(@class, 'pagebuilder-wysiwyg-snapshot')]"/>
18-
<element name="stagePreview" type="button" selector="//div[contains(@class, 'pagebuilder-stage-wrapper') and not(contains(@class, 'stage-full-screen'))]"/>
1917
<element name="stageWrapper" type="button" selector="//div[contains(@class, 'pagebuilder-stage-wrapper')]"/>
18+
<element name="snapshot" type="button" selector="div.stage-content-snapshot"/>
19+
<element name="editButtonSelector" type="button" selector="//button/span[contains(text(), 'Edit with Page Builder')]"/>
2020
<element name="enabled" type="button" selector="//div[not(contains(@class, '_disabled'))]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[contains(@class, 'pagebuilder-stage-wrapper')]"/>
2121
<element name="disabled" type="button" selector="//div[contains(@class, '_disabled')]/div[contains(@class, 'pagebuilder-wysiwyg-wrapper')]/div[contains(@class, 'pagebuilder-stage-wrapper')]"/>
22+
<element name="stageSnapshot" type="button" selector="//div[contains(@class, 'pagebuilder-wysiwyg-wrapper') and contains(@class, 'pagebuilder-wysiwyg-snapshot')]"/>
23+
<element name="stagePreview" type="button" selector="//div[contains(@class, 'pagebuilder-stage-wrapper') and not(contains(@class, 'stage-full-screen'))]"/>
2224
<element name="stageWrapperFullScreen" type="button" selector="div.pagebuilder-stage-wrapper.stage-is-active.stage-full-screen"/>
2325
<element name="stageOverlay" type="button" selector="div.pagebuilder-wysiwyg-overlay"/>
2426
<element name="stageOverlayOnHover" type="button" selector="div.pagebuilder-wysiwyg-overlay._hover"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969
<seeNumberOfElements selector="{{ColumnOnFrontend.allColumns}}" userInput="2" stepKey="see2ColumnsCMSPageStage" after="seeBackgroundColorRowCMSPageStage"/>
7070
<seeElement selector="{{ColumnOnFrontend.backgroundColor('2', PageBuilderBackgroundColor_Hex_White.rgb)}}" stepKey="seeBackgroundColorColumnCMSPageStage" after="see2ColumnsCMSPageStage"/>
7171
<seeElement selector="{{SlideOnFrontend.backgroundColor('1', PageBuilderBackgroundColor_Plaintext_Green.rgb)}}" stepKey="seeBackgroundColorSlide1CMSPageStage" after="seeBackgroundColorColumnCMSPageStage"/>
72-
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage" after="seeBackgroundColorSlide1CMSPageStage"/>
72+
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2" after="seeBackgroundColorSlide1CMSPageStage"/>
73+
<actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage" after="exitPageBuilderFullScreen2"/>
7374
<!-- Validate CMS Page Storefront -->
7475
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToProductStorefront">
7576
<argument name="page" value="$$createCMSPage.identifier$$"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenCoversEntireScreenTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
3333
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3434
</after>
35+
<actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreen"/>
3536
</test>
3637
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenLeftPanelHeightAndFunctionalityTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@
3232
<deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
3333
<deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
3434
</after>
35+
<actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreen"/>
3536
</test>
3637
</tests>

0 commit comments

Comments
 (0)