Skip to content

[MFTF] use AdminOpenCreateNewCMSPageActionGroup for navigation to create new cms page #29821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 4, 2020
Merged

[MFTF] use AdminOpenCreateNewCMSPageActionGroup for navigation to create new cms page #29821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e7914f
V2 use AdminOpenCreateNewCMSPageActionGroup
Usik2203 Aug 22, 2020
e23ab45
Merge branch '2.4-develop' into v2-fix-CmsNewPagePage
Usik2203 Aug 31, 2020
7aa7f6e
Merge branch '2.4-develop' into v2-fix-CmsNewPagePage
Usik2203 Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCreateNewCMSPageActionGroup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
<actionGroup name="AdminOpenCreateNewCMSPageActionGroup">
<annotations>
<description>Open create new CMS Page.</description>
</annotations>

<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToCreateNewPage"/>
<waitForPageLoad stepKey="waitForNewPagePageLoad"/>
</actionGroup>
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToCMSPageTinyMCE3Test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
<magentoCLI command="config:set cms/wysiwyg/editor mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter" stepKey="enableTinyMCE4"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
<waitForPageLoad stepKey="wait5"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage2"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
<comment userInput="removing deprecated element" stepKey="waitForTinyMCE3"/>
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Cms/Test/Mftf/Test/AdminAddVariableToWYSIWYGCMSTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
<fillField selector="{{StoreConfigSection.City}}" userInput="{{_defaultVariable.city}}" stepKey="fillCity" />
<click selector="{{StoreConfigSection.Save}}" stepKey="saveConfig"/>
<!--Main test-->
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
<waitForPageLoad stepKey="waitForPageLoad2"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
</before>
<!--Main test-->
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
<waitForPageLoad stepKey="wait1"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand Down
3 changes: 1 addition & 2 deletions app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
</before>
<!--Main test-->
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
<waitForPageLoad stepKey="wait1"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand Down
3 changes: 1 addition & 2 deletions ...ode/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<actionGroup ref="ConfigAdminAccountSharingActionGroup" stepKey="allowAdminShareAccount"/>
</before>
<!--Main test-->
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
<waitForPageLoad stepKey="wait1"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand Down
3 changes: 1 addition & 2 deletions ...code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
</before>
<!--Main test-->
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
<waitForPageLoad stepKey="wait1"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand Down
3 changes: 1 addition & 2 deletions ...code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
</before>
<!--Main test-->
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
<waitForPageLoad stepKey="wait1"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand Down
3 changes: 1 addition & 2 deletions ...agento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
<actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
</before>
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
<waitForPageLoad stepKey="wait1"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand Down
3 changes: 1 addition & 2 deletions .../Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
<actionGroup ref="SwitchToVersion4ActionGroup" stepKey="switchToTinyMCE4" />
</before>
<!--Main test-->
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage"/>
<waitForPageLoad stepKey="wait1"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand Down
3 changes: 1 addition & 2 deletions ...agento/Cms/Test/Mftf/Test/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
<seeOptionIsSelected selector="{{DefaultLayoutsSection.categoryLayout}}" userInput="No layout updates" stepKey="seeNoLayoutUpdatesSelected2" />
<selectOption selector="{{DefaultLayoutsSection.pageLayout}}" userInput="2 columns with right bar" stepKey="selectColumnsWithRightBar"/>
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig" />
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="amOnPagePagesGrid"/>
<waitForPageLoad stepKey="waitForPageLoad1"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="amOnPagePagesGrid"/>
<waitForLoadingMaskToDisappear stepKey="wait2" />
<click selector="{{CmsDesignSection.DesignTab}}" stepKey="clickOnDesignTab"/>
<waitForElementVisible selector="{{CmsDesignSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
Expand Down
6 changes: 2 additions & 4 deletions app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
<selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 4" stepKey="switchToVersion4" />
<click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions1" />
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig1" />
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage1"/>
<waitForPageLoad stepKey="wait2"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage1"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle1"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab1" />
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4"/>
Expand All @@ -62,8 +61,7 @@
<selectOption selector="{{ContentManagementSection.Switcher}}" userInput="TinyMCE 3" stepKey="switchToVersion3" />
<click selector="{{ContentManagementSection.WYSIWYGOptions}}" stepKey="collapseWYSIWYGOptions2" />
<click selector="{{ContentManagementSection.Save}}" stepKey="clickSaveConfig2" />
<amOnPage url="{{CmsNewPagePage.url}}" stepKey="navigateToPage2"/>
<waitForPageLoad stepKey="wait5"/>
<actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToPage2"/>
<fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{_defaultCmsPage.title}}" stepKey="fillFieldTitle2"/>
<click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickContentTab2" />
<comment userInput="removing deprecated element" stepKey="waitForTinyMCE3"/>
Expand Down