From b90d46caabb7855dcdffbf05d0f943ca5634f262 Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Wed, 18 Mar 2020 05:26:41 +0100 Subject: [PATCH 1/6] Fix failing CMS tests due to PageBuilder conflict --- ...rontRecentlyViewedAtStoreViewLevelTest.xml | 35 ++++++++++--------- .../AdminEditCMSPageContentActionGroup.xml | 7 ++-- ...nInsertRecentlyViewedWidgetActionGroup.xml | 4 +-- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml index f8ee9e562a6a9..012e48e4eeb64 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml @@ -17,8 +17,9 @@ - - + + + @@ -36,6 +37,9 @@ + + + @@ -62,28 +66,27 @@ - + - - + - - + + - - - - - - + + + + + + @@ -96,7 +99,7 @@ - + @@ -105,7 +108,7 @@ - + @@ -129,7 +132,7 @@ - + diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml index b745e9705ed30..c4d832a3bedc1 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml @@ -10,10 +10,11 @@ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - - + + - + + diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml index e8c66c68348fc..8a9815e9fb86f 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml @@ -32,9 +32,9 @@ - + - \ No newline at end of file + From 6be5b23d7cfd7e40cc720e07abe9314c1df1cbd0 Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Wed, 18 Mar 2020 05:56:42 +0100 Subject: [PATCH 2/6] Flushing cache != warming it :facepalm: --- .../Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml index 012e48e4eeb64..2cefc4d9e1b1e 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml @@ -89,7 +89,6 @@ - From ecbd22dff90683c03e9dc4d16a2b034a39f71f5e Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Wed, 18 Mar 2020 06:04:21 +0100 Subject: [PATCH 3/6] Final, working version of fix --- .../Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml | 4 +++- .../AdminInsertRecentlyViewedWidgetActionGroup.xml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml index c4d832a3bedc1..df3d089407bb2 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml @@ -16,7 +16,9 @@ - + + + diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml index 8a9815e9fb86f..3c7c361462c4d 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml @@ -16,9 +16,9 @@ - - - + + + From 5827f754c17332086eee92de078bb8903614777b Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Wed, 18 Mar 2020 11:30:37 +0100 Subject: [PATCH 4/6] Made bar expanding conditional --- .../Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml | 4 ++-- .../AdminInsertRecentlyViewedWidgetActionGroup.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml index df3d089407bb2..983e48359c3b4 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEditCMSPageContentActionGroup.xml @@ -16,9 +16,9 @@ - + + - diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml index 3c7c361462c4d..781cc32834462 100644 --- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml +++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminInsertRecentlyViewedWidgetActionGroup.xml @@ -18,6 +18,7 @@ + From d376b80db56cc6ac4af2f4fb12ae8391d04d45b0 Mon Sep 17 00:00:00 2001 From: Lukasz Bajsarowicz Date: Thu, 9 Apr 2020 18:13:20 +0200 Subject: [PATCH 5/6] Lint code --- ...rontRecentlyViewedAtStoreViewLevelTest.xml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml index 0a027be898c70..5eef25c789a7e 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml @@ -1,12 +1,12 @@ + xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd"> @@ -37,7 +37,6 @@ - @@ -96,7 +95,7 @@ - + @@ -129,7 +128,7 @@ $grabDontSeeHomeProduct3 - $$createSimpleProduct3.name$$ + $$createSimpleProduct3.name$$ @@ -146,8 +145,8 @@ - $grabDontSeeHomeProduct1 - $$createSimpleProduct1.name$$ + $grabDontSeeHomeProduct1 + $$createSimpleProduct1.name$$ From e64ab03b6e49b8bbfed86e4e41272c454afe083e Mon Sep 17 00:00:00 2001 From: Ihor Sviziev Date: Fri, 10 Apr 2020 14:54:52 +0300 Subject: [PATCH 6/6] MFTF: Fix failing CMS tests due to PageBuilder conflict Fix minor issue in formatting --- .../Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml index 5eef25c789a7e..6d4a848f414fa 100644 --- a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml +++ b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontRecentlyViewedAtStoreViewLevelTest.xml @@ -1,9 +1,9 @@