Skip to content

Commit 84d1a5f

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'owls/MC-3329' into cms-team-1-delivery
2 parents d0adf3b + 0be5a7a commit 84d1a5f

37 files changed

+1743
-259
lines changed

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

Lines changed: 4 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"/>
@@ -49,13 +33,15 @@
4933
<waitForElementVisible time="30" selector="{{RowOnStage.base(rowIndex)}}" stepKey="waitForPageBuilderRow"/>
5034
</actionGroup>
5135
<actionGroup name="saveAndContinueEditCmsPage">
36+
<!-- This goes in CE repo -->
5237
<waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveAndContinueVisibility"/>
5338
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveAndContinueEditCmsPage"/>
5439
<waitForPageLoad stepKey="waitForCmsPageLoad"/>
5540
<waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="waitForCmsPageSaveButton"/>
5641
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
5742
</actionGroup>
5843
<actionGroup name="saveCmsPage">
44+
<!-- This goes in CE repo -->
5945
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForSplitButton"/>
6046
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
6147
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="waitForSaveCmsPage"/>
@@ -77,6 +63,7 @@
7763
<dontSee selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seePageBuilderVisible"/>
7864
</actionGroup>
7965
<actionGroup name="setLayout">
66+
<!-- This goes in CE repo -->
8067
<arguments>
8168
<argument name="designSection"/>
8269
<argument name="layoutOption"/>
@@ -102,11 +89,4 @@
10289
<actualResult type="variable">rowWidth</actualResult>
10390
</assertGreaterThan>
10491
</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>
11292
</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/CatalogProductActionGroup.xml‎

Lines changed: 72 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,80 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="openPageBuilderForAttribute">
1212
<arguments>
13-
<argument name="attributeCode" type="string"/>
13+
<argument name="attributeCode" defaultValue="description" type="string"/>
1414
<argument name="section" defaultValue="PageBuilderProductAttribute"/>
15+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
1516
</arguments>
16-
<!-- Opening Page Builder for attribute -->
1717
<comment userInput="Opening Page Builder for attribute" stepKey="commentOpeningPageBuilder"/>
18-
<waitForElementVisible selector="{{section.PageBuilderBtn(attributeCode)}}" stepKey="seePagebuilderBtn"/>
19-
<click selector="{{section.PageBuilderBtn(attributeCode)}}" stepKey="enablePageBuilder"/>
20-
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible" />
18+
<waitForElementVisible selector="{{section.PageBuilderBtn(attributeCode)}}" stepKey="waitForPageBuilderButton"/>
19+
<click selector="{{section.PageBuilderBtn(attributeCode)}}" stepKey="clickOpenPageBuilder"/>
20+
<waitForPageLoad stepKey="waitForPageBuilderToOpen"/>
21+
<waitForElementVisible selector="{{pageBuilderArea}}{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible"/>
22+
</actionGroup>
23+
<actionGroup name="expandAdminProductSection">
24+
<!-- This goes in CE repo -->
25+
<arguments>
26+
<argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
27+
<argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}._show" type="string"/>
28+
</arguments>
29+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
30+
<waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
31+
<conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
32+
<waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>
33+
</actionGroup>
34+
<actionGroup name="navigateToCreatedProductEditPage">
35+
<!-- This goes in CE repo -->
36+
<arguments>
37+
<argument name="product" defaultValue="_defaultProduct"/>
38+
</arguments>
39+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndexPage"/>
40+
<waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
41+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
42+
<waitForPageLoad stepKey="waitForClearFilters"/>
43+
<dontSeeElement selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="dontSeeClearFilters"/>
44+
<click selector="{{AdminProductGridFilterSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
45+
<click selector="{{AdminProductGridFilterSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
46+
<waitForPageLoad stepKey="waitForResetToDefaultView"/>
47+
<see selector="{{AdminProductGridFilterSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
48+
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
49+
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
50+
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
51+
<waitForPageLoad stepKey="waitForFilterOnGrid"/>
52+
<click selector="{{AdminProductGridSection.selectRowBasedOnName(product.name)}}" stepKey="clickProduct"/>
53+
<waitForPageLoad stepKey="waitForProductEditPageLoad"/>
54+
<waitForElementVisible selector="{{AdminProductFormBundleSection.productSku}}" stepKey="waitForProductSKUField"/>
55+
<seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSKU"/>
56+
</actionGroup>
57+
<actionGroup name="NavigateToAndResetProductGridToDefaultView" extends="resetProductGridToDefaultView">
58+
<!-- This goes in CE repo -->
59+
<amOnPage url="{{AdminProductIndexPage.url}}" before="clickClearFilters" stepKey="goToAdminProductIndexPage"/>
60+
<waitForPageLoad after="goToAdminProductIndexPage" stepKey="waitForProductIndexPageToLoad"/>
61+
</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"/>
2188
</actionGroup>
2289
</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/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"/>

0 commit comments

Comments
 (0)