Skip to content

Commit b41705f

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'mainline/develop' into cms-team-2-sprint-11
2 parents 80bc0ac + 00d38a4 commit b41705f

File tree

101 files changed

+1992
-1808
lines changed

Some content is hidden

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

101 files changed

+1992
-1808
lines changed

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

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

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

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="navigateToAPageWithPageBuilder">
12+
<waitForPageLoad stepKey="waitForDashboardPageLoad"/>
13+
<amOnPage url="{{PageBuilderCmsPage.url}}" stepKey="amOnPageBuilderPage"/>
14+
<waitForPageLoad stepKey="waitForPageLoad"/>
15+
</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>
32+
<actionGroup name="addPageBuilderPageTitle">
33+
<arguments>
34+
<argument name="contentType"/>
35+
</arguments>
36+
<fillField selector="{{CmsNewPagePageActionsSection.pageTitle}}" userInput="{{contentType.name}}{{PageBuilderPageTitle.pageName}}" stepKey="enterPageTitle"/>
37+
</actionGroup>
38+
<actionGroup name="switchToPageBuilderStage">
39+
<waitForElementVisible time="30" selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForElementVisible"/>
40+
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
41+
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
42+
<!-- Wait for the first row to be added into the stage for it to be "ready" -->
43+
<waitForElementNotVisible selector="{{PageBuilderStage.stageLoading}}" stepKey="waitForStageLoadingGraphicNotVisible"/>
44+
<waitForElementVisible time="30" selector="{{RowOnStage.base('1')}}" stepKey="waitForPageBuilderRow"/>
45+
</actionGroup>
46+
<actionGroup name="saveAndContinueEditCmsPage">
47+
<waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveAndContinueVisibility"/>
48+
<click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveAndContinueEditCmsPage"/>
49+
<waitForPageLoad stepKey="waitForCmsPageLoad"/>
50+
<waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="waitForCmsPageSaveButton"/>
51+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
52+
</actionGroup>
53+
<actionGroup name="saveCmsPage">
54+
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForSplitButton"/>
55+
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
56+
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="waitForSaveCmsPage"/>
57+
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSaveCmsPage"/>
58+
<waitForElementVisible time="1" selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="waitForCmsPageSaveButton"/>
59+
<see userInput="You saved the page." selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="assertSavePageSuccessMessage"/>
60+
</actionGroup>
61+
<actionGroup name="verifyPageBuilderVisibleOnPage">
62+
<waitForElementVisible selector="{{PageBuilderPanel.generalGroup}}" stepKey="seePageBuilderVisible"/>
63+
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
64+
</actionGroup>
65+
<actionGroup name="verifyPageBuilderVisibleOnStaging">
66+
<scrollTo selector="{{PageBuilderPanel.generalGroup}}" stepKey="scrollToIdentifyPageBuilder"/>
67+
<waitForElementVisible selector="{{PageBuilderPanel.generalGroup}}" stepKey="seePageBuilderVisible"/>
68+
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
69+
</actionGroup>
70+
<actionGroup name="verifyPageBuilderNotVisibleOnPage">
71+
<dontSee userInput="Enable Advanced CMS" stepKey="dontSeeEnableAdvancedCMSBtn"/>
72+
<dontSee selector="{{PageBuilderPanel.generalGroup}}" stepKey="seePageBuilderVisible"/>
73+
</actionGroup>
74+
</actionGroups>

0 commit comments

Comments
 (0)