From cfd6d98f9f520d18cde94462c8df2ee55fe88d9b Mon Sep 17 00:00:00 2001 From: Oleh Usik Date: Fri, 3 Apr 2020 22:42:24 +0300 Subject: [PATCH 01/11] 27550 fixed UX issue for Page/Block grid --- .../ui_component/cms_block_listing.xml | 33 ++--------- .../ui_component/cms_page_listing.xml | 56 ++----------------- 2 files changed, 8 insertions(+), 81 deletions(-) diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml index af54df24b64f5..a15d0b2fceaa8 100644 --- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml @@ -96,22 +96,13 @@ - - - - false - - block_id - true - cms_block_listing.cms_block_listing.cms_block_columns.ids - - cms_block_listing.cms_block_listing.cms_block_columns_editor - startEdit + cms_block_listing.cms_block_listing.cms_block_columns.actions + applyAction - ${ $.$data.rowIndex } - true + edit + ${ $.$data.rowIndex } @@ -131,25 +122,12 @@ text - - - true - - text - text - - - true - true - - text - @@ -164,9 +142,6 @@ select - - select - select diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml index 846356adf9429..cd86c58be6f82 100644 --- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml +++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml @@ -115,22 +115,13 @@ - - - - false - - page_id - true - cms_page_listing.cms_page_listing.cms_page_columns.ids - - cms_page_listing.cms_page_listing.cms_page_columns_editor - startEdit + cms_page_listing.cms_page_listing.cms_page_columns.actions + applyAction - ${ $.$data.rowIndex } - true + edit + ${ $.$data.rowIndex } @@ -152,24 +143,12 @@ text - - - true - - text - text - - - true - - text - @@ -177,9 +156,6 @@ select - - select - select @@ -195,9 +171,6 @@ select - - select - select @@ -221,9 +194,6 @@ false MMM d, y dateRange - - date - date false @@ -234,9 +204,6 @@ false MMM d, y dateRange - - date - date false @@ -246,9 +213,6 @@ select - - select - select false @@ -258,9 +222,6 @@ select - - select - select false @@ -269,9 +230,6 @@ text - - text - false @@ -279,9 +237,6 @@ text - - text - false @@ -289,9 +244,6 @@ text - - text - false From 3bdb6e05e27c655b225a0628926f6f908c154d6e Mon Sep 17 00:00:00 2001 From: Oleh Usik Date: Fri, 3 Apr 2020 23:51:11 +0300 Subject: [PATCH 02/11] add MFTF for Cms Page --- .../Section/CmsPagesPageActionsSection.xml | 1 + ...oToCmsEditPageAfterClickPageOnGridTest.xml | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml index 494c98ca44e7f..3c329bea216c1 100644 --- a/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml +++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsPagesPageActionsSection.xml @@ -30,5 +30,6 @@ + diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml new file mode 100644 index 0000000000000..352c6996bc251 --- /dev/null +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml @@ -0,0 +1,31 @@ + + + + + + + + + <description value="Go to CMS Edit Page after choosing page on the grid."/> + <severity value="MINOR"/> + </annotations> + <before> + <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> + </before> + <after> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> + </after> + + <amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/> + <waitForPageLoad stepKey="waitForGridLoad"/> + <click selector="{{CmsPagesPageActionsSection.homePage}}" stepKey="navigateToHomePage"/> + <waitForPageLoad stepKey="waitForCmsHomePageLoad"/> + <seeInCurrentUrl url="cms/page/edit/page_id/2" stepKey="seeInHomePage"/> + </test> +</tests> From 9087ed043114b20ea4a3a54fd5edd029f7dc9c02 Mon Sep 17 00:00:00 2001 From: Oleh Usik <o.usik@atwix.com> Date: Sun, 5 Apr 2020 12:42:43 +0300 Subject: [PATCH 03/11] Add MFTF for block --- .../AdminCreateNewCMSBlockActionGroup.xml | 23 +++++++++++++ .../Mftf/Section/AdminBlockGridSection.xml | 2 ++ .../BlockContentSection.xml | 1 + .../BlockNewPageBasicFieldsSection.xml | 2 +- ...BlockEditPageAfterClickBlockOnGridTest.xml | 34 +++++++++++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml create mode 100644 app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml new file mode 100644 index 0000000000000..f281ab5092ae4 --- /dev/null +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminCreateNewCMSBlockActionGroup"> + <amOnPage url="{{CmsNewBlock.url}}" stepKey="amNewCMSBlockPage"/> + <waitForPageLoad stepKey="waitForBlockPageLoad"/> + <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle1"/> + <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/> + <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView"/> + <click selector="{{BlockContentSection.showEditor}}" stepKey="showEditor"/> + <fillField selector="{{BlockContentSection.TextArea}}" userInput="{{_defaultBlock.content}}" stepKey="fillContentField"/> + <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/> + <waitForPageLoad stepKey="waitForBlockSave"/> + <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppear"/> + <see userInput="You saved the block." selector="{{AdminMessagesSection.success}}" stepKey="assertSaveBlockSuccessMessage"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml index ab15570a01f40..1604fb8b3bbec 100644 --- a/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml +++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml @@ -14,5 +14,7 @@ <element name="checkbox" type="checkbox" selector="//label[@class='data-grid-checkbox-cell-inner']//input[@class='admin__control-checkbox']"/> <element name="select" type="select" selector="//tr[@class='data-row']//button[@class='action-select']"/> <element name="editInSelect" type="text" selector="//a[contains(text(), 'Edit')]"/> + <element name="addNewBlock" type="text" selector="//button[@title='Add New Block']"/> + <element name="blockEditPage" type="text" selector="//div[contains(text(),'{{blockTitle}}')]" parameterized="true"/> </section> </sections> diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml index 1d5e8541dd497..7bf4a6bfdf696 100644 --- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml +++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml @@ -11,5 +11,6 @@ <element name="TextArea" type="input" selector="#cms_block_form_content"/> <element name="image" type="file" selector="#tinymce img"/> <element name="contentIframe" type="iframe" selector="cms_block_form_content_ifr"/> + <element name="showEditor" type="text" selector="//button[@id='togglecms_block_form_content']"/> </section> </sections> diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection/BlockNewPageBasicFieldsSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection/BlockNewPageBasicFieldsSection.xml index 9b358dcb25769..6271dcdc83911 100644 --- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection/BlockNewPageBasicFieldsSection.xml +++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockBasicFieldsSection/BlockNewPageBasicFieldsSection.xml @@ -9,7 +9,7 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> <section name="BlockNewPageBasicFieldsSection"> <element name="isActive" type="button" selector="//input[@name='is_active' and @value='{{var1}}']" parameterized="true"/> - <element name="blockTitle" type="input" selector="input[name=title]"/> + <element name="blockTitle" type="input" selector="//input[@name='title']"/> <element name="identifier" type="input" selector="input[name=identifier]"/> <element name="storeView" type="multiselect" selector="select[name=store_id]"/> <element name="duplicatedIdentifier" type="input" selector="//input[contains(@data-value,'{{var1}}')]" parameterized="true"/> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml new file mode 100644 index 0000000000000..ee902f43cfe77 --- /dev/null +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> + <test name="AdminGoToBlockEditPageAfterClickBlockOnGridTest"> + <annotations> + <features value="Cms"/> + <stories value="Go to CMS Block Edit Page"/> + <title value="Go to CMS Block Edit Page after choosing block on the grid."/> + <description value="Go to CMS Block Edit Page after choosing block on the grid."/> + <severity value="MINOR"/> + </annotations> + <before> + <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> + </before> + <after> + <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="removeBlock"/> + <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> + </after> + + <actionGroup ref="AdminCreateNewCMSBlockActionGroup" stepKey="addNewBlock"/> + + <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateBlockGrid"/> + <waitForPageLoad stepKey="waitForBlockGridLoad"/> + <click selector="{{AdminBlockGridSection.blockEditPage(_defaultBlock.title)}}" stepKey="navigateToBlockEditPage"/> + <waitForPageLoad stepKey="waitForBlockEditPageLoad"/> + <seeInCurrentUrl url="cms/block/edit/block_id/" stepKey="seeInBlockEditPage"/> + </test> +</tests> From ecaa592bab9f65ed1afc768e94c55e40deff5dc1 Mon Sep 17 00:00:00 2001 From: Oleh Usik <o.usik@atwix.com> Date: Wed, 15 Apr 2020 18:48:50 +0300 Subject: [PATCH 04/11] Minor changes in MFTF --- .../Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml index 352c6996bc251..cedcd4bc8df94 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml @@ -22,10 +22,9 @@ <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> </after> - <amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/> - <waitForPageLoad stepKey="waitForGridLoad"/> + <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCmsPagesGrid"/> <click selector="{{CmsPagesPageActionsSection.homePage}}" stepKey="navigateToHomePage"/> <waitForPageLoad stepKey="waitForCmsHomePageLoad"/> - <seeInCurrentUrl url="cms/page/edit/page_id/2" stepKey="seeInHomePage"/> + <see userInput="Home page" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="seeHomePageTitle"/> </test> </tests> From 2dafd789943118c8047173577ec952bd2f91c8d8 Mon Sep 17 00:00:00 2001 From: Oleh Usik <o.usik@atwix.com> Date: Wed, 15 Apr 2020 19:11:57 +0300 Subject: [PATCH 05/11] some changes --- .../Test/Mftf/Section/AdminCmsBlockPageSection.xml | 14 ++++++++++++++ ...nGoToBlockEditPageAfterClickBlockOnGridTest.xml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockPageSection.xml diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockPageSection.xml new file mode 100644 index 0000000000000..e06b6ee774394 --- /dev/null +++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockPageSection.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> + <section name="AdminCmsBlockPageSection"> + <element name="cmsBlockTitle" type="text" selector=".page-header .page-title"/> + </section> +</sections> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml index ee902f43cfe77..67bbcc5a59f2f 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml @@ -29,6 +29,6 @@ <waitForPageLoad stepKey="waitForBlockGridLoad"/> <click selector="{{AdminBlockGridSection.blockEditPage(_defaultBlock.title)}}" stepKey="navigateToBlockEditPage"/> <waitForPageLoad stepKey="waitForBlockEditPageLoad"/> - <seeInCurrentUrl url="cms/block/edit/block_id/" stepKey="seeInBlockEditPage"/> + <see userInput="{{_defaultBlock.title}}" selector="{{AdminCmsBlockPageSection.cmsBlockTitle}}" stepKey="seeHomePageTitle"/> </test> </tests> From b77463a53d5b5a25110457843eaf84ad6e72ff54 Mon Sep 17 00:00:00 2001 From: Oleh Usik <o.usik@atwix.com> Date: Thu, 16 Apr 2020 00:01:03 +0300 Subject: [PATCH 06/11] Fixed failed check --- .../Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml index f281ab5092ae4..e3861a033f5a1 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml @@ -13,8 +13,6 @@ <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle1"/> <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/> <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView"/> - <click selector="{{BlockContentSection.showEditor}}" stepKey="showEditor"/> - <fillField selector="{{BlockContentSection.TextArea}}" userInput="{{_defaultBlock.content}}" stepKey="fillContentField"/> <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/> <waitForPageLoad stepKey="waitForBlockSave"/> <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppear"/> From b06403047dfc73b2192f25b3aed4ba193fe9ac67 Mon Sep 17 00:00:00 2001 From: Oleh Usik <o.usik@atwix.com> Date: Sat, 3 Oct 2020 02:10:09 +0300 Subject: [PATCH 07/11] Refactoring tests --- ...ClickTableGridRowBySelectorActionGroup.xml | 22 +++++++++++++++++++ .../AdminCreateNewCMSBlockActionGroup.xml | 4 ++++ .../AdminOpenCmsBlocksGridActionGroup.xml | 18 +++++++++++++++ .../Mftf/Section/AdminCmsBlockPageSection.xml | 14 ------------ ...lockEditPageAfterClickBlockOnGridTest.xml} | 21 ++++++++++-------- ...enCmsEditPageAfterClickPageOnGridTest.xml} | 19 ++++++++++------ 6 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClickTableGridRowBySelectorActionGroup.xml create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml delete mode 100644 app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockPageSection.xml rename app/code/Magento/Cms/Test/Mftf/Test/{AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml => AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml} (50%) rename app/code/Magento/Cms/Test/Mftf/Test/{AdminGoToCmsEditPageAfterClickPageOnGridTest.xml => AdminOpenCmsEditPageAfterClickPageOnGridTest.xml} (53%) diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClickTableGridRowBySelectorActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClickTableGridRowBySelectorActionGroup.xml new file mode 100644 index 0000000000000..fcdb5df529b89 --- /dev/null +++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClickTableGridRowBySelectorActionGroup.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> + +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminClickTableGridRowBySelectorActionGroup"> + <annotations> + <description>Click table grid row by selector.</description> + </annotations> + <arguments> + <argument name="selector" type="string"/> + </arguments> + + <click selector="{{selector}}" stepKey="clickRow"/> + <waitForPageLoad stepKey="waitForPageLoad"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml index e3861a033f5a1..9b26ddec2a56b 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml @@ -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="AdminCreateNewCMSBlockActionGroup"> + <annotations> + <description>Create new CMS Block.</description> + </annotations> + <amOnPage url="{{CmsNewBlock.url}}" stepKey="amNewCMSBlockPage"/> <waitForPageLoad stepKey="waitForBlockPageLoad"/> <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle1"/> diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml new file mode 100644 index 0000000000000..3d1c17f4bc706 --- /dev/null +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + /** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ +--> +<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> + <actionGroup name="AdminOpenCmsBlocksGridActionGroup"> + <annotations> + <description>Open grid of CMS Blocks.</description> + </annotations> + + <amOnPage url="{{CmsBlocksPage.url}}" stepKey="openCmsBlockGrid"/> + <waitForPageLoad stepKey="waitForCmsBlockGridLoad"/> + </actionGroup> +</actionGroups> diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockPageSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockPageSection.xml deleted file mode 100644 index e06b6ee774394..0000000000000 --- a/app/code/Magento/Cms/Test/Mftf/Section/AdminCmsBlockPageSection.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> - -<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd"> - <section name="AdminCmsBlockPageSection"> - <element name="cmsBlockTitle" type="text" selector=".page-header .page-title"/> - </section> -</sections> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml similarity index 50% rename from app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml rename to app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml index 67bbcc5a59f2f..5ae11c543b455 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToBlockEditPageAfterClickBlockOnGridTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml @@ -7,12 +7,12 @@ --> <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - <test name="AdminGoToBlockEditPageAfterClickBlockOnGridTest"> + <test name="AdminOpenBlockEditPageAfterClickBlockOnGridTest"> <annotations> <features value="Cms"/> - <stories value="Go to CMS Block Edit Page"/> - <title value="Go to CMS Block Edit Page after choosing block on the grid."/> - <description value="Go to CMS Block Edit Page after choosing block on the grid."/> + <stories value="Open CMS Block Edit Page"/> + <title value="Open CMS Block Edit Page after choosing block on the grid."/> + <description value="Open CMS Block Edit Page after choosing block on the grid."/> <severity value="MINOR"/> </annotations> <before> @@ -24,11 +24,14 @@ </after> <actionGroup ref="AdminCreateNewCMSBlockActionGroup" stepKey="addNewBlock"/> + <actionGroup ref="AdminOpenCmsBlocksGridActionGroup" stepKey="openCmsBlocksGrid"/> - <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateBlockGrid"/> - <waitForPageLoad stepKey="waitForBlockGridLoad"/> - <click selector="{{AdminBlockGridSection.blockEditPage(_defaultBlock.title)}}" stepKey="navigateToBlockEditPage"/> - <waitForPageLoad stepKey="waitForBlockEditPageLoad"/> - <see userInput="{{_defaultBlock.title}}" selector="{{AdminCmsBlockPageSection.cmsBlockTitle}}" stepKey="seeHomePageTitle"/> + <actionGroup ref="AdminClickTableGridRowBySelectorActionGroup" stepKey="clickTableRow"> + <argument name="selector" value="{{AdminBlockGridSection.blockEditPage(_defaultBlock.title)}}"/> + </actionGroup> + + <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle"> + <argument name="title" value="{{_defaultBlock.title}}"/> + </actionGroup> </test> </tests> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml similarity index 53% rename from app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml rename to app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml index cedcd4bc8df94..fd25cd310bc29 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminGoToCmsEditPageAfterClickPageOnGridTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml @@ -7,12 +7,12 @@ --> <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> - <test name="AdminGoToCmsEditPageAfterClickPageOnGridTest"> + <test name="AdminOpenCmsEditPageAfterClickPageOnGridTest"> <annotations> <features value="Cms"/> - <stories value="Go to CMS Edit Page"/> - <title value="Go to CMS Edit Page after choosing page on the grid."/> - <description value="Go to CMS Edit Page after choosing page on the grid."/> + <stories value="Open CMS Edit Page"/> + <title value="Open CMS Edit Page after choosing page on the grid."/> + <description value="Open CMS Edit Page after choosing page on the grid."/> <severity value="MINOR"/> </annotations> <before> @@ -23,8 +23,13 @@ </after> <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCmsPagesGrid"/> - <click selector="{{CmsPagesPageActionsSection.homePage}}" stepKey="navigateToHomePage"/> - <waitForPageLoad stepKey="waitForCmsHomePageLoad"/> - <see userInput="Home page" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="seeHomePageTitle"/> + + <actionGroup ref="AdminClickTableGridRowBySelectorActionGroup" stepKey="clickTableRow"> + <argument name="selector" value="{{CmsPagesPageActionsSection.homePage}}"/> + </actionGroup> + + <actionGroup ref="AdminAssertPageTitleActionGroup" stepKey="seePageTitle"> + <argument name="title" value="Home page"/> + </actionGroup> </test> </tests> From e304ad433121d81b0b6a2427e2eea586449d7470 Mon Sep 17 00:00:00 2001 From: Oleh Usik <o.usik@atwix.com> Date: Sat, 24 Oct 2020 14:58:50 +0300 Subject: [PATCH 08/11] minor fixes --- .../AdminCreateNewCMSBlockActionGroup.xml | 25 ------------------- ...BlockEditPageAfterClickBlockOnGridTest.xml | 4 +-- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml deleted file mode 100644 index 9b26ddec2a56b..0000000000000 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCreateNewCMSBlockActionGroup.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - /** - * Copyright © Magento, Inc. All rights reserved. - * See COPYING.txt for license details. - */ ---> -<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="AdminCreateNewCMSBlockActionGroup"> - <annotations> - <description>Create new CMS Block.</description> - </annotations> - - <amOnPage url="{{CmsNewBlock.url}}" stepKey="amNewCMSBlockPage"/> - <waitForPageLoad stepKey="waitForBlockPageLoad"/> - <fillField selector="{{BlockNewPageBasicFieldsSection.blockTitle}}" userInput="{{_defaultBlock.title}}" stepKey="fillFieldTitle1"/> - <fillField selector="{{BlockNewPageBasicFieldsSection.identifier}}" userInput="{{_defaultBlock.identifier}}" stepKey="fillFieldIdentifier"/> - <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="All Store View" stepKey="selectAllStoreView"/> - <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/> - <waitForPageLoad stepKey="waitForBlockSave"/> - <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppear"/> - <see userInput="You saved the block." selector="{{AdminMessagesSection.success}}" stepKey="assertSaveBlockSuccessMessage"/> - </actionGroup> -</actionGroups> diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml index 5ae11c543b455..d5904c00bd94e 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml @@ -16,14 +16,14 @@ <severity value="MINOR"/> </annotations> <before> + <createData entity="_defaultBlock" stepKey="createPreReqBlock" /> <actionGroup ref="AdminLoginActionGroup" stepKey="login"/> </before> <after> - <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="removeBlock"/> + <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock" /> <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/> </after> - <actionGroup ref="AdminCreateNewCMSBlockActionGroup" stepKey="addNewBlock"/> <actionGroup ref="AdminOpenCmsBlocksGridActionGroup" stepKey="openCmsBlocksGrid"/> <actionGroup ref="AdminClickTableGridRowBySelectorActionGroup" stepKey="clickTableRow"> From 02c20ac1f9bab7540ff6472634d27ec3f8196675 Mon Sep 17 00:00:00 2001 From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com> Date: Tue, 3 Nov 2020 13:44:13 +0200 Subject: [PATCH 09/11] add testcaseId --- .../Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml index d5904c00bd94e..06318a21bd7c9 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenBlockEditPageAfterClickBlockOnGridTest.xml @@ -13,6 +13,7 @@ <stories value="Open CMS Block Edit Page"/> <title value="Open CMS Block Edit Page after choosing block on the grid."/> <description value="Open CMS Block Edit Page after choosing block on the grid."/> + <testCaseId value="MC-38853"/> <severity value="MINOR"/> </annotations> <before> From bd9ab111a79a936d6a0b50b36854e27ab26eb14c Mon Sep 17 00:00:00 2001 From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com> Date: Tue, 3 Nov 2020 13:45:12 +0200 Subject: [PATCH 10/11] add testCaseId --- .../Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml index fd25cd310bc29..1468bc5439143 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml @@ -13,6 +13,7 @@ <stories value="Open CMS Edit Page"/> <title value="Open CMS Edit Page after choosing page on the grid."/> <description value="Open CMS Edit Page after choosing page on the grid."/> + <testCaseId value="MC-38854"/> <severity value="MINOR"/> </annotations> <before> From 030f847d4edd54fef7374ee023b3599ba5882f98 Mon Sep 17 00:00:00 2001 From: Oleh Usik <o.usik@atwix.com> Date: Wed, 11 Nov 2020 15:18:01 +0200 Subject: [PATCH 11/11] minor change --- .../Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml index 1468bc5439143..d7b7dacd93d18 100644 --- a/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml +++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminOpenCmsEditPageAfterClickPageOnGridTest.xml @@ -24,6 +24,7 @@ </after> <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCmsPagesGrid"/> + <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/> <actionGroup ref="AdminClickTableGridRowBySelectorActionGroup" stepKey="clickTableRow"> <argument name="selector" value="{{CmsPagesPageActionsSection.homePage}}"/>