Skip to content

Commit cc76c3d

Browse files
davemacaulaydavemacaulay
committed
Merge branch '1.0.0-release' into MC-5373
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup.xml # app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup.xml
2 parents 8342be4 + 34891c0 commit cc76c3d

File tree

261 files changed

+3943
-1068
lines changed

Some content is hidden

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

261 files changed

+3943
-1068
lines changed

‎CONTRIBUTING.md

Lines changed: 0 additions & 37 deletions
This file was deleted.

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

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,9 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="navigateToAPageWithPageBuilder">
1212
<waitForPageLoad stepKey="waitForDashboardPageLoad"/>
13-
<amOnPage url="{{PageBuilderCmsPage.url}}" stepKey="amOnPageBuilderPage"/>
13+
<amOnPage url="{{CmsPagesPage.url}}/new" stepKey="amOnPageBuilderPage"/>
1414
<waitForPageLoad stepKey="waitForPageLoad"/>
1515
</actionGroup>
16-
<actionGroup name="searchAndViewCmsPage">
17-
<arguments>
18-
<argument name="contentType"/>
19-
</arguments>
20-
<amOnPage url="{{CmsPagesPage.url}}" stepKey="onCmsPagesPageActionsSection"/>
21-
<waitForPageLoad stepKey="waitForCmsPagesGridLoad"/>
22-
<click selector="{{CmsPagesPageActionsSection.filterButton}}" stepKey="clickFiltersBtn" />
23-
<fillField selector="{{CmsPagesPageActionsSection.URLKey}}" userInput="{{contentType.name}}{{PageBuilderPageTitle.pageName}}" stepKey="fillOutURLKey" />
24-
<click selector="{{CmsPagesPageActionsSection.ApplyFiltersBtn}}" stepKey="clickApplyBtn" />
25-
<waitForPageLoad stepKey="waitForSearchResults" />
26-
<waitForElementVisible selector="{{CmsPagesPageActionsSection.firstItemSelectButton}}" stepKey="waitForFirstItemButton" />
27-
<click selector="{{CmsPagesPageActionsSection.firstItemSelectButton}}" stepKey="clickSelectButtonOnFirstItem"/>
28-
<waitForElementVisible selector="{{CmsPagesPageActionsSection.firstItemEditButton}}" stepKey="waitForFirstItemEditButton"/>
29-
<click selector="{{CmsPagesPageActionsSection.firstItemEditButton}}" stepKey="clickSelectEditOnFirstItem"/>
30-
<waitForPageLoad stepKey="waitForEditCmsPage"/>
31-
</actionGroup>
3216
<actionGroup name="addPageBuilderPageTitle">
3317
<arguments>
3418
<argument name="contentType"/>
@@ -48,14 +32,23 @@
4832
<waitForElementNotVisible selector="{{PageBuilderStage.stageLoading}}" stepKey="waitForStageLoadingGraphicNotVisible"/>
4933
<waitForElementVisible time="30" selector="{{RowOnStage.base(rowIndex)}}" stepKey="waitForPageBuilderRow"/>
5034
</actionGroup>
35+
<actionGroup name="saveCMSBlock">
36+
<!-- This goes in CE repo -->
37+
<waitForElementVisible selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="waitForSaveButton"/>
38+
<click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="clickSaveButton"/>
39+
<waitForPageLoad stepKey="waitForPageLoad"/>
40+
<see userInput="You saved the block." stepKey="seeSuccessfulSaveMessage"/>
41+
</actionGroup>
5142
<actionGroup name="saveAndContinueEditCmsPage">
43+
<!-- This goes in CE repo -->
5244
<waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveAndContinueVisibility"/>
5345
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveAndContinueEditCmsPage"/>
5446
<waitForPageLoad stepKey="waitForCmsPageLoad"/>
5547
<waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="waitForCmsPageSaveButton"/>
5648
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
5749
</actionGroup>
5850
<actionGroup name="saveCmsPage">
51+
<!-- This goes in CE repo -->
5952
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForSplitButton"/>
6053
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
6154
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="waitForSaveCmsPage"/>
@@ -77,6 +70,7 @@
7770
<dontSee selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seePageBuilderVisible"/>
7871
</actionGroup>
7972
<actionGroup name="setLayout">
73+
<!-- This goes in CE repo -->
8074
<arguments>
8175
<argument name="designSection"/>
8276
<argument name="layoutOption"/>
@@ -102,11 +96,4 @@
10296
<actualResult type="variable">rowWidth</actualResult>
10397
</assertGreaterThan>
10498
</actionGroup>
105-
<actionGroup name="openPageBuilderOnCatalog">
106-
<click selector="{{PageBuilderCatalog.openPageBuilder}}" stepKey="clickOnPageBuilderBtn" />
107-
<!--See PageBuilder fullsize-->
108-
<comment userInput="See PageBuilder fullsize" stepKey="commentSeePageBuilderFullsize"/>
109-
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible" />
110-
<seeElement selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="seePageBuilderFullSizeScreen" />
111-
</actionGroup>
11299
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<!-- Consider moving action group to core, or utilising core action group if one is added at a later date -->
1110
<actionGroup name="addUpSellProductBySku" extends="addRelatedProductBySku">
11+
<!-- This goes in CE repo -->
1212
<click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddUpSellProductsButton}}" stepKey="clickAddRelatedProductButton"/>
1313
<conditionalClick selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
1414
<click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@
4949
<argument name="index" defaultValue="1" type="string"/>
5050
<argument name="headingType" defaultValue="PageBuilderHeadingTypeDefaultProperty"/>
5151
<argument name="headingAlignment" defaultValue="PageBuilderHeadingAlignmentProperty_left"/>
52+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
5253
</arguments>
5354
<comment userInput="Click outside heading editable area" stepKey="commentClickOutside"/>
54-
<moveMouseOver selector="{{PageBuilderPanel.searchPanel}}" stepKey="moveMouseOutsideLiveEdit"/>
55-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
55+
<moveMouseOver selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="moveMouseOutsideLiveEdit"/>
56+
<click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
5657
<waitForPageLoad stepKey="waitForAnimation2"/>
5758
<dontSeeElement selector="{{HeadingOnStage.headingTypeToolbar(index, headingType.toolbar)}}" stepKey="dontSeeHeadingTypeToolbar"/>
5859
<dontSeeElement selector="{{HeadingOnStage.headingTextAlignToolbar(index, headingAlignment.toolbar)}}" stepKey="dontSeeHeadingAlignmentToolbar"/>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="switchSlide">
1212
<arguments>
13-
<argument name="section" defaultValue="SliderOnFrontend"/>
14-
<argument name="index" defaultValue="2" type="string"/>
13+
<argument name="sliderSection" defaultValue="SliderOnStage"/>
14+
<argument name="slideSection" defaultValue="SlideOnBackend"/>
15+
<argument name="sliderIndex" defaultValue="1" type="string"/>
16+
<argument name="slideIndex" defaultValue="1" type="string"/>
1517
</arguments>
16-
<waitForElementVisible selector="{{SliderOnFrontend.slideNavigator(index)}}" stepKey="waitForSliderButton"/>
17-
<click selector="{{SliderOnFrontend.slideNavigator(index)}}" stepKey="clickSliderButton"/>
18-
<waitForPageLoad stepKey="waitForPageLoad"/>
19-
<waitForElementVisible selector="{{SlideOnFrontend.slide(index)}}" stepKey="waitForSlide"/>
18+
<waitForElementVisible selector="{{sliderSection.slideNavigationDot(sliderIndex, slideIndex)}}" stepKey="waitForSlideNavigationDot"/>
19+
<click selector="{{sliderSection.slideNavigationDot(sliderIndex, slideIndex)}}" stepKey="clickSlideNavigationDot"/>
20+
<waitForPageLoad stepKey="waitForAnimation"/>
21+
<waitForElementVisible selector="{{slideSection.base(slideIndex)}}" stepKey="waitForSlide"/>
2022
</actionGroup>
2123
<actionGroup name="unfocusSlideOptions">
2224
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,35 @@
2020
<assertElementContainsAttribute selector="{{section.tabPanel(from)}}" attribute="aria-hidden" expectedValue="true" stepKey="assertOldTabHidden"/>
2121
<assertElementContainsAttribute selector="{{section.tabPanel(to)}}" attribute="aria-hidden" expectedValue="false" stepKey="assertNewTabVisible"/>
2222
</actionGroup>
23+
<actionGroup name="inlineEditTabItemName">
24+
<arguments>
25+
<argument name="tabName" defaultValue="{{PageBuilderTabNameRandom1.value}}" type="string"/>
26+
<argument name="index" defaultValue="1" type="string"/>
27+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
28+
</arguments>
29+
<comment userInput="inlineEditTabItemName" stepKey="comment"/>
30+
<waitForElementVisible selector="{{TabOnStage.tabHeaderEditableTitle(index)}}" stepKey="waitForTabHeaderVisible"/>
31+
<pressKey selector="{{TabOnStage.tabHeaderEditableTitle(index)}}" userInput="{{tabName}}" stepKey="enterTabName"/>
32+
<see selector="{{TabOnStage.tabHeader(index)}}" userInput="{{tabName}}" stepKey="seeTabName"/>
33+
<click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="unFocusLiveEdit"/>
34+
<waitForPageLoad stepKey="waitForUnFocus"/>
35+
</actionGroup>
36+
<actionGroup name="moveTabItem">
37+
<arguments>
38+
<argument name="x" defaultValue="null" type="string"/>
39+
<argument name="y" defaultValue="null" type="string"/>
40+
<argument name="tabGroupIndex" defaultValue="1" type="string"/>
41+
<argument name="tabItemIndexToMove" defaultValue="1" type="string"/>
42+
<argument name="tabItemIndexToMoveTo" defaultValue="2" type="string"/>
43+
</arguments>
44+
<comment userInput="moveTabItem" stepKey="comment"/>
45+
<waitForElementVisible selector="{{TabOnStage.tabHeader(tabItemIndexToMove)}}" stepKey="waitForTabItem1"/>
46+
<click selector="{{TabOnStage.tabHeader(tabItemIndexToMove)}}" stepKey="clickTabItem1"/>
47+
<waitForPageLoad stepKey="waitForPageLoad1"/>
48+
<!-- Note MFTF Bug: MQE-1185. We cannot reliably use offsets and therefore, dropping to index x will result in an actual drop of index x-1 -->
49+
<!-- Once bug is fixed, we need to add executeJS to calculate width & height of tab item to determine default offsets -->
50+
<dragAndDrop selector1="{{TabOnStage.moveHandle(tabGroupIndex, tabItemIndexToMove)}}" selector2="{{TabOnStage.tabHeader(tabItemIndexToMoveTo)}}" x="{{x}}" y="{{y}}" stepKey="dragAndDropTabItem"/>
51+
<waitForPageLoad stepKey="waitForPageLoad2"/>
52+
<waitForElementVisible selector="{{TabOnStage.tabHeader(tabItemIndexToMove)}}" stepKey="waitForTabItem2"/>
53+
</actionGroup>
2354
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
5353
<waitForElementVisible time="5" selector="{{EditPanelForm.editFormSave}}" stepKey="waitForColumnSaveButton" />
5454
<click selector="{{EditPanelForm.editFormSave}}" stepKey="clickSaveColumn"/>
55-
<waitForElementNotVisible time="5" selector="{{EditPanelForm.editForm}}" stepKey="waitForEditFormNotVisible" />
5655
<waitForPageLoad stepKey="waitForSavePanelClose"/>
56+
<waitForElementNotVisible time="5" selector="{{EditPanelForm.editForm}}" stepKey="waitForEditFormNotVisible" />
5757
</actionGroup>
5858
<actionGroup name="expandConfigurationSection">
5959
<arguments>

0 commit comments

Comments
 (0)