Skip to content

Commit 68388a7

Browse files
davemacaulaydavemacaulay
authored
Merge pull request #77 from magento-obsessive-owls/MAGETWO-86953-drag-and-drop
[CMS Team 1] Drag & Drop
2 parents f517305 + 5040aae commit 68388a7

File tree

111 files changed

+4207
-1563
lines changed

Some content is hidden

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

111 files changed

+4207
-1563
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ This project repository contains PageBuilder developer documentation on the foll
3434
1. [Content type configuration]
3535
1. [How to add a new content type]
3636
1. [Events]
37+
1. [Bindings]
3738
1. [Master format]
3839
1. [Visual select]
3940
1. [Custom Toolbar]
@@ -47,6 +48,7 @@ This project repository contains PageBuilder developer documentation on the foll
4748
[Content type configuration]: app/code/Magento/PageBuilder/docs/content-type-configuration.md
4849
[How to add a new content type]: app/code/Magento/PageBuilder/docs/how-to-add-new-content-type.md
4950
[Events]: app/code/Magento/PageBuilder/docs/events.md
51+
[Bindings]: app/code/Magento/PageBuilder/docs/bindings.md
5052
[Master format]: app/code/Magento/PageBuilder/docs/master-format.md
5153
[Visual select]: app/code/Magento/PageBuilder/docs/visual-select.md
5254
[Custom Toolbar]: app/code/Magento/PageBuilder/docs/toolbar.md

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

Lines changed: 258 additions & 130 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<expectedResult type="variable">initialNumberOfButtonsPlusOne</expectedResult>
2626
<actualResult type="variable">numberOfButtonsAfterAdd</actualResult>
2727
</assertEquals>
28+
<click selector="{{PageBuilderActionsSection.searchPanel}}" stepKey="unfocusButtonLiveEdit"/>
2829
</actionGroup>
2930
<actionGroup name="validateButtonItemContent">
3031
<arguments>
@@ -52,6 +53,8 @@
5253
<waitForElementVisible selector="{{ButtonItemOnStage.editableButtonItemElement(index)}}" stepKey="waitForButtonEditable"/>
5354
<pressKey selector="{{ButtonItemOnStage.editableButtonItemElement(index)}}" userInput="{{text.value}}" stepKey="enterButtonText"/>
5455
<waitForElementVisible selector="{{ButtonItemOnStage.buttonItemText(index, text.value)}}" stepKey="waitForButtonText"/>
56+
<click selector="{{PageBuilderActionsSection.searchPanel}}" stepKey="unfocusLiveEdit"/>
57+
<waitForPageLoad stepKey="waitForUnfocus"/>
5558
</actionGroup>
5659
<actionGroup name="moveButton">
5760
<arguments>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,18 @@
2121
<waitForElementVisible time="1" selector="{{PageBuilderColumnSection.column}}" stepKey="waitForColumn" />
2222
<seeElement selector="{{PageBuilderColumnSection.column}}" stepKey="seeElementColumn"/>
2323
</actionGroup>
24+
<actionGroup name="dragColumnToAnotherColumnGroup">
25+
<arguments>
26+
<argument name="contentType" defaultValue="PageBuilderColumnContentType"/>
27+
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
28+
<argument name="containerTargetType" defaultValue="PageBuilderColumnContentType"/>
29+
<argument name="containerTargetIndex" defaultValue="1" type="string"/>
30+
</arguments>
31+
<waitForElementVisible time="20" selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
32+
<moveMouseOver selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" x="10" y="0" stepKey="onMouseOverContentTypeStage"/>
33+
<waitForPageLoad time="30" stepKey="waitForMouseOverAnimation"/>
34+
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentTypeOptionsMenuByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForOptions"/>
35+
<waitForElementVisible selector="{{PageBuilderColumnSection.columnMoveByIndex(contentTypeIndex)}}" stepKey="waitForMoveHandle"/>
36+
<dragAndDrop selector1="{{PageBuilderColumnSection.columnMoveByIndex(contentTypeIndex)}}" selector2="{{PageBuilderActionsSection.contentTypeContainer(contentType.role, containerTargetIndex)}}" stepKey="moveContentTypeIntoContainer"/>
37+
</actionGroup>
2438
</actionGroups>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
<click selector="{{SliderOnFrontend.slideNavigator(index)}}" stepKey="clickSliderButton"/>
1717
<waitForElementVisible selector="{{SlideOnFrontend.slide(index)}}" stepKey="waitForSlide"/>
1818
</actionGroup>
19+
<actionGroup name="unfocusSlideOptions">
20+
<click selector="{{PageBuilderActionsSection.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
21+
<waitForPageLoad stepKey="waitForAnimation" time="30"/>
22+
<waitForElementNotVisible selector="{{SliderInAdmin.slideOptionsEdit}}" stepKey="dontSeeSlideOptionsEdit"/>
23+
</actionGroup>
1924
<actionGroup name="openSlideOptions">
2025
<comment userInput="Open slide options" stepKey="commentOpen"/>
2126
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentTypeInStageVisible" />
@@ -44,6 +49,7 @@
4449
<click selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="clickActiveSlideNavigationDot"/>
4550
<seeElement selector="{{SliderInAdmin.slideOptions}}" stepKey="seeContentTypeOptionsMenu"/>
4651
<click selector="{{SliderInAdmin.slideOptionsRemove}}" stepKey="clickRemoveContentType"/>
52+
<wait time="0.5" stepKey="waitForRemovalAnimation" />
4753
</actionGroup>
4854
<actionGroup name="addSlide">
4955
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentTypeInStageVisible" />

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</arguments>
4646
<waitForElementVisible time="10" selector="{{TabOnStage.tabHeader(index)}}" stepKey="waitForContentTypeInStageVisible" />
4747
<click stepKey="clickTabTitle" selector="{{TabOnStage.tabHeader(index)}}"/>
48-
<waitForElementVisible selector="{{TabOnStage.tabOptionsEdit}}" stepKey="seeTabOptionsEdit"/>
48+
<waitForElementVisible time="30" selector="{{TabOnStage.tabOptionsEdit}}" stepKey="seeTabOptionsEdit"/>
4949
<click selector="{{TabOnStage.tabOptionsDuplicate}}" stepKey="clickEditContentType"/>
5050
</actionGroup>
5151
<actionGroup name="openTabOptionsByIndex">
@@ -68,7 +68,7 @@
6868
</arguments>
6969
<click selector="{{TabOnStage.tabHeader(to)}}" stepKey="switchToTab"/>
7070
<waitForPageLoad stepKey="waitForTabChangeAnimation" time="30"/>
71-
<waitForElementVisible selector="{{TabOnStage.tabHeaderItemActive(to)}}" stepKey="seeNewTabActive"/>
71+
<waitForElementVisible time="30" selector="{{TabOnStage.tabHeaderItemActive(to)}}" stepKey="seeNewTabActive"/>
7272
<assertElementContainsAttribute selector="{{TabOnStage.tabPanel(from)}}" attribute="aria-hidden" expectedValue="true" stepKey="assertOldTabHidden"/>
7373
<assertElementContainsAttribute selector="{{TabOnStage.tabPanel(to)}}" attribute="aria-hidden" expectedValue="false" stepKey="assertNewTabVisible"/>
7474
</actionGroup>
@@ -77,12 +77,13 @@
7777
<argument name="from" defaultValue="1" type="string"/>
7878
<argument name="to" defaultValue="2" type="string"/>
7979
</arguments>
80+
<!-- requires reloadPage before for tabs to become active, see MAGETWO-92406 -->
8081
<click selector="{{TabOnStorefront.tabHeader(to)}}" stepKey="switchToTab"/>
8182
<waitForPageLoad stepKey="waitForTabChangeAnimationStorefront1" time="30"/>
8283
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
83-
<wait time="1" stepKey="waitForTabRender"/>
84+
<wait time="2" stepKey="waitForTabRender"/>
8485
<waitForPageLoad stepKey="waitForTabChangeAnimationStorefront2" time="30"/>
85-
<waitForElementVisible selector="{{TabOnStorefront.tabHeaderItemActive(to)}}" stepKey="seeNewTabActive"/>
86+
<waitForElementVisible time="30" selector="{{TabOnStorefront.tabHeaderItemActive(to)}}" stepKey="seeNewTabActive"/>
8687
<assertElementContainsAttribute selector="{{TabOnStorefront.tabContent(from)}}" attribute="aria-hidden" expectedValue="true" stepKey="assertOldTabHidden"/>
8788
<assertElementContainsAttribute selector="{{TabOnStorefront.tabContent(to)}}" attribute="aria-hidden" expectedValue="false" stepKey="assertNewTabVisible"/>
8889
</actionGroup>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
<data key="value">align-center</data>
4343
</entity>
4444
<!-- Minimum Height -->
45+
<entity name="PageBuilderEmptyColumnHeightProperty" type="pagebuilder_column_min_height_property">
46+
<data key="value">190</data>
47+
<data key="valueWithPadding">210</data>
48+
</entity>
4549
<entity name="PageBuilderAppearanceMinHeightProperty" type="pagebuilder_column_min_height_property">
4650
<data key="name">Minimum Height</data>
4751
<data key="section">appearance_fieldset</data>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<data key="index">1</data>
1313
<data key="pageName" unique="suffix">testcmspage</data>
1414
</entity>
15+
<entity name="PageBuilderStage" type="pagebuilder_content_type">
16+
<data key="role">stage</data>
17+
</entity>
1518
<entity name="PageBuilderRowContentType" type="pagebuilder_content_type">
1619
<data key="name">Row</data>
1720
<data key="section">General</data>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
-->
88
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
<entity name="PageBuilderRowDefaultHeight" type="pagebuilder_row">
11+
<data key="value">300</data>
12+
</entity>
1013
<!-- Background Color -->
1114
<entity name="PageBuilderRowBackgroundColor_Default" type="pagebuilder_row_background_color_property">
1215
<data key="name">Background Color</data>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,7 @@
6969
<data key="fieldName">min_height</data>
7070
<data key="value">500</data>
7171
</entity>
72+
<entity name="PageBuilderEmptySliderContainerHeightProperty" type="pagebuilder_slider_property">
73+
<data key="value">368</data>
74+
</entity>
7275
</entities>

0 commit comments

Comments
 (0)