Skip to content

Commit 27d8b92

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'develop' into MAGETWO-86953-drag-and-drop
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ActionGroup.xml # app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/SliderActionGroup.xml # app/code/Magento/PageBuilder/Test/Mftf/Data/ContentTypeData.xml # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderActionsSection.xml # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection.xml # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest.xml # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest.xml # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideCommonTest.xml # app/code/Magento/PageBuilder/etc/content_type_merged.xsd # app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type-collection.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/preview.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/panel.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/resource/sortable/knockout-sortable.js # app/code/Magento/PageBuilder/view/adminhtml/web/js/stage.js # app/code/Magento/PageBuilder/view/adminhtml/web/template/panel.html # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-dropped-params.d.ts # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-instance-dropped-params.d.ts # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-sorted-params.d.ts # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.ts # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel.ts # app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage.ts
2 parents 2ce807a + f517305 commit 27d8b92

File tree

189 files changed

+4230
-4185
lines changed

Some content is hidden

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

189 files changed

+4230
-4185
lines changed

‎app/code/Magento/PageBuilder/Model/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function getGroups()
4141
}
4242

4343
/**
44-
* Return all content blocks
44+
* Return all content types
4545
*
4646
* @return array|mixed|null
4747
*/

‎app/code/Magento/PageBuilder/Model/ContentBlock/DataProvider.php renamed to ‎app/code/Magento/PageBuilder/Model/ContentType/DataProvider.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\PageBuilder\Model\ContentBlock;
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\PageBuilder\Model\ContentType;
710

811
/**
912
* We populate our forms in the browser using JavaScript
@@ -15,7 +18,7 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
1518
*
1619
* @return array
1720
*/
18-
public function getData()
21+
public function getData(): array
1922
{
2023
return [];
2124
}

‎app/code/Magento/PageBuilder/Model/Stage/Config.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
class Config
1111
{
1212
const DEFAULT_PREVIEW_COMPONENT = 'Magento_PageBuilder/js/content-type/preview';
13-
const DEFAULT_CONTENT_COMPONENT = 'Magento_PageBuilder/js/content-type/content';
13+
const DEFAULT_MASTER_COMPONENT = 'Magento_PageBuilder/js/content-type/master';
1414

1515
/**
1616
* @var \Magento\PageBuilder\Model\Config\ConfigInterface
@@ -77,7 +77,7 @@ public function getConfig()
7777
}
7878

7979
/**
80-
* Retrieve the content block groups
80+
* Retrieve the content type groups
8181
*
8282
* @return array
8383
*/
@@ -87,27 +87,27 @@ private function getGroups()
8787
}
8888

8989
/**
90-
* Build up the content block data
90+
* Build up the content type data
9191
*
9292
* @return array
9393
*/
9494
private function getContentTypes()
9595
{
9696
$contentTypes = $this->config->getContentTypes();
9797

98-
$contentBlockData = [];
98+
$contentTypeData = [];
9999
foreach ($contentTypes as $name => $contentType) {
100-
$contentBlockData[$name] = $this->flattenContentTypeData(
100+
$contentTypeData[$name] = $this->flattenContentTypeData(
101101
$name,
102102
$contentType
103103
);
104104
}
105105

106-
return $contentBlockData;
106+
return $contentTypeData;
107107
}
108108

109109
/**
110-
* Flatten the content block data
110+
* Flatten the content type data
111111
*
112112
* @param $name
113113
* @param $contentType
@@ -135,9 +135,9 @@ private function flattenContentTypeData($name, $contentType)
135135
'preview_component' => (isset($contentType['preview_component'])
136136
? $contentType['preview_component']
137137
: self::DEFAULT_PREVIEW_COMPONENT),
138-
'content_component' => (isset($contentType['content_component'])
139-
? $contentType['content_component']
140-
: self::DEFAULT_CONTENT_COMPONENT),
138+
'master_component' => (isset($contentType['master_component'])
139+
? $contentType['master_component']
140+
: self::DEFAULT_MASTER_COMPONENT),
141141
'allowed_parents' => isset($contentType['allowed_parents']) ? $contentType['allowed_parents'] : [],
142142
'readers' => isset($contentType['readers']) ? $contentType['readers'] : [],
143143
'appearances' => isset($contentType['appearances']) ? $contentType['appearances'] : [],

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

Lines changed: 165 additions & 146 deletions
Large diffs are not rendered by default.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
</arguments>
1515
<comment userInput="Adding Button" stepKey="comment"/>
1616
<executeJS function="return Math.round(document.getElementsByClassName('pagebuilder-button-item').length+1)" stepKey="initialNumberOfButtonsPlusOne"/>
17-
<moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStageByIndex(PageBuilderButtonsContentBlock.role, buttonGroupIndex)}}" stepKey="mouseOverButtonsGroup"/>
17+
<moveMouseOver selector="{{PageBuilderActionsSection.contentTypeInStageByIndex(PageBuilderButtonsContentType.role, buttonGroupIndex)}}" stepKey="mouseOverButtonsGroup"/>
1818
<waitForPageLoad stepKey="waitForPageLoad"/>
19-
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenu(PageBuilderButtonsContentBlock.role)}}" stepKey="waitForOptionsMenu"/>
19+
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentTypeOptionsMenu(PageBuilderButtonsContentType.role)}}" stepKey="waitForOptionsMenu"/>
2020
<waitForElementVisible time="10" selector="{{ButtonGroupOnStage.addNewButtonItemOption(buttonGroupIndex)}}" stepKey="seeAddButton"/>
2121
<click selector="{{ButtonGroupOnStage.addNewButtonItemOption(buttonGroupIndex)}}" stepKey="clickAddButton"/>
2222
<waitForPageLoad stepKey="waitForPageLoad2"/>
@@ -67,8 +67,8 @@
6767
<waitForElementVisible selector="{{ButtonItemOnStage.base(buttonIndexToMove)}}" stepKey="waitForButton1"/>
6868
<click selector="{{ButtonItemOnStage.base(buttonIndexToMove)}}" stepKey="clickButton"/>
6969
<waitForPageLoad stepKey="waitForPageLoad1"/>
70-
<waitForElementVisible selector="{{PageBuilderActionsSection.contentBlockMoveByIndex(PageBuilderButtonItemContentBlock.role, buttonIndexToMove)}}" stepKey="waitForMoveButton"/>
71-
<dragAndDrop selector1="{{PageBuilderActionsSection.contentBlockMoveByIndex(PageBuilderButtonItemContentBlock.role, buttonIndexToMove)}}" selector2="{{targetSelector}}" x="{{x}}" y="{{y}}" stepKey="dragAndDropButton"/>
70+
<waitForElementVisible selector="{{PageBuilderActionsSection.contentTypeMoveByIndex(PageBuilderButtonItemContentType.role, buttonIndexToMove)}}" stepKey="waitForMoveButton"/>
71+
<dragAndDrop selector1="{{PageBuilderActionsSection.contentTypeMoveByIndex(PageBuilderButtonItemContentType.role, buttonIndexToMove)}}" selector2="{{targetSelector}}" x="{{x}}" y="{{y}}" stepKey="dragAndDropButton"/>
7272
<waitForPageLoad stepKey="waitForPageLoad2"/>
7373
<waitForElementVisible selector="{{ButtonItemOnStage.base(buttonIndexToMove)}}" stepKey="waitForButton2"/>
7474
</actionGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="openPageBuilderEditColumnPanel">
1212
<moveMouseOver selector="{{PageBuilderColumnSection.columnInStage}}" x="10" y="0" stepKey="onMouseOverColumn"/>
13-
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenu('column')}}" stepKey="waitForOptions" />
13+
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentTypeOptionsMenu('column')}}" stepKey="waitForOptions" />
1414
<click selector="{{PageBuilderColumnSection.editColumn}}" stepKey="clickEditColumn"/>
1515
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
1616
<waitForElementVisible selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm"/>
17-
<see userInput="Edit Column" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
17+
<see userInput="Edit Column" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
1818
</actionGroup>
1919
<actionGroup name="dragPageBuilderColumnIntoStage">
2020
<dragAndDrop selector1="{{PageBuilderColumnSection.draggableColumnInPanel}}" selector2="{{PageBuilderColumnSection.dropAreaInDefaultStage}}" stepKey="dropColumnIntoStage"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
</actionGroup>
2020
<actionGroup name="verifyUploadImageButtons">
2121
<arguments>
22-
<argument name="contentBlockType"/>
22+
<argument name="contentType"/>
2323
<argument name="section"/>
2424
</arguments>
2525
<comment userInput="Hover uploaded image to check Upload New Image button and Select From Gallery button" stepKey="commentHover"/>
26-
<moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(contentBlockType.role)}}" x="10" y="0" stepKey="onMouseOverBannerContentBlockStage"/>
26+
<moveMouseOver selector="{{PageBuilderActionsSection.contentTypeInStage(contentType.role)}}" x="10" y="0" stepKey="onMouseOverBannerContentTypeStage"/>
2727
<waitForElementVisible selector="{{section.uploadNewImageBtn}}" stepKey="waitForUploadNewImageBtn" />
2828
<waitForElementVisible selector="{{section.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn2" />
2929
</actionGroup>

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,41 +23,41 @@
2323
</actionGroup>
2424
<actionGroup name="openSlideOptions">
2525
<comment userInput="Open slide options" stepKey="commentOpen"/>
26-
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentBlockInStageVisible" />
26+
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentTypeInStageVisible" />
2727
<click stepKey="clickNavigationDot" selector="{{SliderInAdmin.firstSlideNavigationDot}}"/>
2828
<waitForElementVisible selector="{{SliderInAdmin.slideOptionsEdit}}" stepKey="waitForSlideOptionsEdit"/>
29-
<click selector="{{SliderInAdmin.slideOptionsEdit}}" stepKey="clickEditContentBlock"/>
29+
<click selector="{{SliderInAdmin.slideOptionsEdit}}" stepKey="clickEditContentType"/>
3030
<waitForLoadingMaskToDisappear stepKey="waitForAnimation" />
3131
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm" />
32-
<see userInput="Edit Slide" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
32+
<see userInput="Edit Slide" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
3333
</actionGroup>
3434
<actionGroup name="openSlideOptionsByIndex">
3535
<arguments>
3636
<argument name="index" defaultValue="1" type="string"/>
3737
</arguments>
3838
<comment userInput="Open slide options by index" stepKey="commentOpenByIndex"/>
39-
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentBlockInStageVisible" />
39+
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentTypeInStageVisible" />
4040
<click stepKey="clickNavigationDot" selector="{{SliderInAdmin.slideNavigationDot(index)}}"/>
4141
<waitForElementVisible selector="{{SliderInAdmin.slideOptionsEdit}}" stepKey="waitForSlideOptionsEdit"/>
42-
<click selector="{{SliderInAdmin.slideOptionsEdit}}" stepKey="clickEditContentBlock"/>
42+
<click selector="{{SliderInAdmin.slideOptionsEdit}}" stepKey="clickEditContentType"/>
4343
<waitForLoadingMaskToDisappear stepKey="waitForAnimation" />
4444
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm" />
45-
<see userInput="Edit Slide" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
45+
<see userInput="Edit Slide" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
4646
</actionGroup>
4747
<actionGroup name="removeSlide">
48-
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentBlockInStageVisible" />
48+
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentTypeInStageVisible" />
4949
<click selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="clickActiveSlideNavigationDot"/>
50-
<seeElement selector="{{SliderInAdmin.slideOptions}}" stepKey="seeContentBlockOptionsMenu"/>
51-
<click selector="{{SliderInAdmin.slideOptionsRemove}}" stepKey="clickRemoveContentBlock"/>
50+
<seeElement selector="{{SliderInAdmin.slideOptions}}" stepKey="seeContentTypeOptionsMenu"/>
51+
<click selector="{{SliderInAdmin.slideOptionsRemove}}" stepKey="clickRemoveContentType"/>
5252
<wait time="0.5" stepKey="waitForRemovalAnimation" />
5353
</actionGroup>
5454
<actionGroup name="addSlide">
55-
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentBlockInStageVisible" />
55+
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentTypeInStageVisible" />
5656
<click stepKey="focusOnSlider" selector="{{SliderInAdmin.sliderContainer}}"/>
5757
<scrollTo selector="div.pagebuilder-header" x="0" y="-100" stepKey="scrollToTop"/>
58-
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentBlockStage"/>
58+
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentTypeStage"/>
5959
<waitForPageLoad stepKey="waitForPageLoad"/>
60-
<waitForElementVisible time="5" selector="{{SliderInAdmin.sliderOptions}}" stepKey="seeContentBlockOptionsMenu"/>
60+
<waitForElementVisible time="5" selector="{{SliderInAdmin.sliderOptions}}" stepKey="seeContentTypeOptionsMenu"/>
6161
<moveMouseOver selector="{{SliderInAdmin.sliderOptions}}" stepKey="onMouseOverOptionsMenu"/>
6262
<click selector="{{SliderInAdmin.addNewSlide}}" stepKey="clickAddNewSlideChild"/>
6363
<waitForLoadingMaskToDisappear stepKey="waitForAnimation"/>

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,57 +9,57 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="addTab">
12-
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusOnContentBlock"/>
13-
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderTabsContentBlock.role)}}" stepKey="waitForContentBlockInStageVisible" />
14-
<moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderTabsContentBlock.role)}}" x="10" y="0" stepKey="onMouseOverContentBlockStage"/>
12+
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusOnContentType"/>
13+
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentTypeInStage(PageBuilderTabsContentType.role)}}" stepKey="waitForContentTypeInStageVisible" />
14+
<moveMouseOver selector="{{PageBuilderActionsSection.contentTypeInStage(PageBuilderTabsContentType.role)}}" x="10" y="0" stepKey="onMouseOverContentTypeStage"/>
1515
<waitForPageLoad stepKey="waitForMouseOverAnimation" />
16-
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenu(PageBuilderTabsContentBlock.role)}}" stepKey="waitForOptions" />
17-
<click selector="{{PageBuilderActionsSection.contentBlockAdd(PageBuilderTabsContentBlock.role)}}" stepKey="clickAddContentBlock"/>
16+
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentTypeOptionsMenu(PageBuilderTabsContentType.role)}}" stepKey="waitForOptions" />
17+
<click selector="{{PageBuilderActionsSection.contentTypeAdd(PageBuilderTabsContentType.role)}}" stepKey="clickAddContentType"/>
1818
<waitForPageLoad stepKey="waitForNewTab" time="30"/>
1919
</actionGroup>
2020
<actionGroup name="addTabAndOpenNewTabOptions">
2121
<arguments>
2222
<argument name="from" defaultValue="1" type="string"/>
2323
<argument name="to" defaultValue="2" type="string"/>
2424
</arguments>
25-
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusOnContentBlock"/>
26-
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderTabsContentBlock.role)}}" stepKey="waitForContentBlockInStageVisible" />
27-
<moveMouseOver selector="{{PageBuilderActionsSection.contentBlockInStage(PageBuilderTabsContentBlock.role)}}" x="10" y="0" stepKey="onMouseOverContentBlockStage"/>
25+
<click selector="{{TabsOnStage.tabsContainer}}" stepKey="focusOnContentType"/>
26+
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentTypeInStage(PageBuilderTabsContentType.role)}}" stepKey="waitForContentTypeInStageVisible" />
27+
<moveMouseOver selector="{{PageBuilderActionsSection.contentTypeInStage(PageBuilderTabsContentType.role)}}" x="10" y="0" stepKey="onMouseOverContentTypeStage"/>
2828
<waitForPageLoad stepKey="waitForMouseOverAnimation" time="30"/>
29-
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentBlockOptionsMenu(PageBuilderTabsContentBlock.role)}}" stepKey="waitForOptions" />
30-
<click selector="{{PageBuilderActionsSection.contentBlockAdd(PageBuilderTabsContentBlock.role)}}" stepKey="clickAddContentBlock"/>
29+
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.contentTypeOptionsMenu(PageBuilderTabsContentType.role)}}" stepKey="waitForOptions" />
30+
<click selector="{{PageBuilderActionsSection.contentTypeAdd(PageBuilderTabsContentType.role)}}" stepKey="clickAddContentType"/>
3131
<waitForPageLoad stepKey="waitForNewTab" time="30"/>
3232
<waitForElementVisible selector="{{TabOnStage.tabContent(to)}}" stepKey="waitForNewTabContent"/>
3333
<waitForElementVisible selector="{{TabOnStage.tabHeader(to)}}" stepKey="waitForNewTabHeader"/>
3434
<waitForElementVisible selector="{{TabOnStage.tabOptionsByIndex(to)}}" stepKey="waitForTabOptionsPanel"/>
3535
<waitForElementVisible selector="{{TabOnStage.tabOptionsEdit}}" stepKey="seeTabOptionsEdit2"/>
36-
<click selector="{{TabOnStage.tabOptionsEdit}}" stepKey="clickEditContentBlock2"/>
36+
<click selector="{{TabOnStage.tabOptionsEdit}}" stepKey="clickEditContentType2"/>
3737
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm" />
3838
<!-- Required time wait due to animation -->
3939
<waitForPageLoad stepKey="waitForAnimation" time="30"/>
40-
<see userInput="Edit Tab" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
40+
<see userInput="Edit Tab" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
4141
</actionGroup>
4242
<actionGroup name="duplicateTabByIndex">
4343
<arguments>
4444
<argument name="index" defaultValue="1" type="string"/>
4545
</arguments>
46-
<waitForElementVisible time="10" selector="{{TabOnStage.tabHeader(index)}}" stepKey="waitForContentBlockInStageVisible" />
46+
<waitForElementVisible time="10" selector="{{TabOnStage.tabHeader(index)}}" stepKey="waitForContentTypeInStageVisible" />
4747
<click stepKey="clickTabTitle" selector="{{TabOnStage.tabHeader(index)}}"/>
4848
<waitForElementVisible selector="{{TabOnStage.tabOptionsEdit}}" stepKey="seeTabOptionsEdit"/>
49-
<click selector="{{TabOnStage.tabOptionsDuplicate}}" stepKey="clickEditContentBlock"/>
49+
<click selector="{{TabOnStage.tabOptionsDuplicate}}" stepKey="clickEditContentType"/>
5050
</actionGroup>
5151
<actionGroup name="openTabOptionsByIndex">
5252
<arguments>
5353
<argument name="index" defaultValue="1" type="string"/>
5454
</arguments>
55-
<waitForElementVisible time="10" selector="{{TabOnStage.tabHeader(index)}}" stepKey="waitForContentBlockInStageVisible" />
55+
<waitForElementVisible time="10" selector="{{TabOnStage.tabHeader(index)}}" stepKey="waitForContentTypeInStageVisible" />
5656
<click stepKey="clickTabTitle" selector="{{TabOnStage.tabHeader(index)}}"/>
5757
<waitForElementVisible selector="{{TabOnStage.tabOptionsEdit}}" stepKey="seeTabOptionsEdit"/>
58-
<click selector="{{TabOnStage.tabOptionsEdit}}" stepKey="clickEditContentBlock"/>
58+
<click selector="{{TabOnStage.tabOptionsEdit}}" stepKey="clickEditContentType"/>
5959
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditForm" />
6060
<!-- Required time wait due to animation -->
6161
<waitForPageLoad stepKey="waitForAnimation" time="30"/>
62-
<see userInput="Edit Tab" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentBlockNameInEditFormTitle"/>
62+
<see userInput="Edit Tab" selector="{{PageBuilderActionsSection.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
6363
</actionGroup>
6464
<actionGroup name="switchTabsAdmin">
6565
<arguments>

0 commit comments

Comments
 (0)