Skip to content

Commit 66f214f

Browse files
anthoulaanthoula
committed
Merge branch 'MC-3329' of github.com:magento-obsessive-owls/magento2-page-builder into MC-3328-mftf-block
2 parents 3d33585 + 0be5a7a commit 66f214f

File tree

59 files changed

+1218
-1814
lines changed

Some content is hidden

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

59 files changed

+1218
-1814
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
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>
1616
<actionGroup name="addPageBuilderPageTitle">

‎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/CatalogProductActionGroup.xml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,21 @@
1212
<arguments>
1313
<argument name="attributeCode" defaultValue="description" type="string"/>
1414
<argument name="section" defaultValue="PageBuilderProductAttribute"/>
15+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
1516
</arguments>
1617
<comment userInput="Opening Page Builder for attribute" stepKey="commentOpeningPageBuilder"/>
1718
<waitForElementVisible selector="{{section.PageBuilderBtn(attributeCode)}}" stepKey="waitForPageBuilderButton"/>
1819
<click selector="{{section.PageBuilderBtn(attributeCode)}}" stepKey="clickOpenPageBuilder"/>
1920
<waitForPageLoad stepKey="waitForPageBuilderToOpen"/>
20-
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible"/>
21+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible"/>
2122
</actionGroup>
2223
<actionGroup name="expandAdminProductSection">
2324
<!-- This goes in CE repo -->
2425
<arguments>
2526
<argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
2627
<argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}._show" type="string"/>
2728
</arguments>
29+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
2830
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
2931
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
3032
<waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>
@@ -57,4 +59,31 @@
5759
<amOnPage url="{{AdminProductIndexPage.url}}" before="clickClearFilters" stepKey="goToAdminProductIndexPage"/>
5860
<waitForPageLoad after="goToAdminProductIndexPage" stepKey="waitForProductIndexPageToLoad"/>
5961
</actionGroup>
62+
<actionGroup name="saveProductAttribute">
63+
<!-- This goes in CE repo -->
64+
<waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
65+
<click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
66+
<waitForPageLoad stepKey="waitForAttributeToSave"/>
67+
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
68+
</actionGroup>
69+
<actionGroup name="confirmChangeInputTypeModal">
70+
<!-- This goes in CE repo -->
71+
<waitForElementVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="waitForChangeInputTypeButton"/>
72+
<click selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="clickChangeInputTypeButton"/>
73+
<waitForElementNotVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostModal}}" stepKey="waitForChangeInputTypeModalGone"/>
74+
</actionGroup>
75+
<actionGroup name="saveProductAttributeInUse">
76+
<!-- This goes in CE repo -->
77+
<waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
78+
<click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
79+
<waitForPageLoad stepKey="waitForAttributeToSave"/>
80+
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
81+
</actionGroup>
82+
<actionGroup name="NavigateToAndResetProductAttributeGridToDefaultView">
83+
<!-- This goes in CE repo -->
84+
<amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
85+
<waitForPageLoad stepKey="waitForPageLoad"/>
86+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
87+
<waitForPageLoad stepKey="waitForGridLoad"/>
88+
</actionGroup>
6089
</actionGroups>

‎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/LayoutConfigurationActionGroup.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="RestoreLayoutSetting">
12+
<!-- Remove the existing layout update entries, as they can be merged in the wrong order -->
13+
<remove keyForRemoval="selectOneColumn"/>
14+
<remove keyForRemoval="selectNoLayoutUpdates1"/>
15+
<remove keyForRemoval="selectNoLayoutUpdates2"/>
16+
<!-- Set the defaults to those now set by Page Builder -->
17+
<selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="{{PageBuilderFullWidthLayout.cms}}" stepKey="selectCmsFullWidth" after="expandDefaultLayouts"/>
18+
<selectOption selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="{{PageBuilderFullWidthLayout.category}}" stepKey="selectCategoryFullWidth" after="expandDefaultLayouts"/>
19+
<selectOption selector="{{DefaultLayoutsSection.productLayout}}" userInput="{{PageBuilderFullWidthLayout.product}}" stepKey="selectProductFullWidth" after="expandDefaultLayouts"/>
20+
</actionGroup>
1121
<actionGroup name="validateLayoutStylesNoHeight">
1222
<arguments>
1323
<argument name="page"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<expectedResult type="variable">initialNumberOfChildContentTypesPlusOne</expectedResult>
9999
<actualResult type="variable">numberOfChildContentTypesAfterAdd</actualResult>
100100
</assertEquals>
101-
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
101+
<click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
102102
<waitForPageLoad stepKey="waitForAnimation2"/>
103103
</actionGroup>
104104
<actionGroup name="duplicateContentType">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<argument name="pageBuilderArea" defaultValue="" type="string"/>
1515
</arguments>
1616
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.panelGroup(group.section)}}" stepKey="waitForGroupVisible"/>
17-
<conditionalClick selector="{{pageBuilderArea}}{{PageBuilderPanel.panelGroup(group.section)}}" dependentSelector="{{PageBuilderPanel.panelGroupActive(group.section)}}" visible="false" stepKey="expandGroup"/>
17+
<conditionalClick selector="{{pageBuilderArea}}{{PageBuilderPanel.panelGroup(group.section)}}" dependentSelector="{{pageBuilderArea}}{{PageBuilderPanel.panelGroupActive(group.section)}}" visible="false" stepKey="expandGroup"/>
1818
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.panelGroupActive(group.section)}}" stepKey="waitForGroupExpanded"/>
1919
</actionGroup>
2020
<actionGroup name="closePageBuilderPanelGroups">

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

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

0 commit comments

Comments
 (0)