Skip to content

Commit c0f3da1

Browse files
ENGCOM-8683: [MFTF] Updating with SaveCmsPageActionGroup #31568
- Merge Pull Request #31568 from AnnaAPak/magento2:upd-with-SaveCmsPageActionGroup - Merged commits: 1. 0b50c8b 2. 87ac7a7 3. 10afdae 4. b7f93d7
2 parents 81ad0b4 + b7f93d7 commit c0f3da1

13 files changed

+55
-55
lines changed

app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGCMSTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
<actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup" />
6161
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
6262
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="$$createCMSPage.identifier$$" stepKey="fillFieldUrlKey"/>
63-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
64-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
65-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
66-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
63+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
64+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
65+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
66+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
6767
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
6868
<waitForPageLoad stepKey="wait4"/>
6969
<seeElement selector="{{StorefrontCMSPageSection.mediaDescription}}" stepKey="assertMediaDescription"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGBlockTest.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@
113113
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidgetBtn"/>
114114
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading"/>
115115
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad10"/>
116-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveButtonVisible"/>
117-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
118-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
119-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
120-
<waitForPageLoad stepKey="waitForPageLoadAfterSaveCmsPage" />
121-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
116+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSaveButtonVisible"/>
117+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
118+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
119+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
120+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoadAfterSaveCmsPage"/>
121+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
122122
<conditionalClick selector="{{BlockPageActionsSection.clearAll}}" dependentSelector="{{BlockPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
123123
<waitForPageLoad stepKey="waitForPageLoad2"/>
124124
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage1"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
7676
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
7777
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
78-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
79-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
80-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
81-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
78+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
79+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
80+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
81+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
8282
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
8383
<!--see Default Variable on Storefront-->
8484
<see userInput="{{_defaultVariable.city}}" stepKey="seeDefaultVariable" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGBlockTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@
6565
<actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidgetBtn"/>
6666
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForLoading2"/>
6767
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad6"/>
68-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
69-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
70-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
71-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
68+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
69+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
70+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
71+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
7272
<actionGroup ref="ClearCacheActionGroup" stepKey="clearCache" />
7373
<amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage1"/>
7474
<waitForPageLoad stepKey="waitForPageLoad7" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@
5555
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
5656
<wait stepKey="waitForPageLoad5" time="10" />
5757
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
58-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
59-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
60-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
61-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
58+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
59+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
60+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
61+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
6262
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
6363
<waitForPageLoad stepKey="wait5" />
6464
<see userInput="Hello CMS Page!" stepKey="seeContent"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
5757
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
5858
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
59-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
60-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
61-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
62-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
59+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
60+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
61+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
62+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
6363
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
6464
<waitForPageLoad stepKey="wait5" />
6565
<!--see widget on Storefront-->

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
5555
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
5656
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
57-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
58-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
59-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
60-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
57+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
58+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
59+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
60+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
6161
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
6262
<waitForPageLoad stepKey="wait5" />
6363
<see userInput="Hello CMS Page!" stepKey="seeContent"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
6262
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
6363
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
64-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
65-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
66-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
67-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
64+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
65+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
66+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
67+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
6868
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
6969
<waitForPageLoad stepKey="wait7" />
7070
<!--see widget on Storefront-->

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
8585
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
8686
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
87-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
88-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
89-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
90-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
87+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
88+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
89+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
90+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
9191
<amOnPage url="{{_defaultCmsPage.identifier}}" stepKey="amOnPageTestPage"/>
9292
<waitForPageLoad stepKey="wait5" />
9393
<!--see widget on Storefront-->

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
<scrollTo selector="{{CmsNewPagePageSeoSection.header}}" stepKey="scrollToSearchEngineTab" />
5757
<click selector="{{CmsNewPagePageSeoSection.header}}" stepKey="clickExpandSearchEngineOptimisation"/>
5858
<fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{_defaultCmsPage.identifier}}" stepKey="fillFieldUrlKey"/>
59-
<click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandButtonMenu"/>
60-
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.splitButtonMenu}}" stepKey="waitForSplitButtonMenuVisible"/>
61-
<click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSavePage"/>
62-
<see userInput="You saved the page." stepKey="seeSuccessMessage"/>
59+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandButtonMenu"/>
60+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSplitButtonMenuVisible"/>
61+
<actionGroup ref="SaveCmsPageActionGroup" stepKey="clickSavePage"/>
62+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
6363
<amOnPage url="$$createPreReqProduct.name$$.html" stepKey="amOnProductPage" />
6464
<waitForPageLoad stepKey="waitForPage" />
6565
<click selector="{{WidgetSection.CompareBtn}}" stepKey="clickCompareBtn" />

0 commit comments

Comments
 (0)