From 81564c91a5b110fbaa634e45f6b7b27b98198bae Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Mon, 17 Dec 2018 12:56:48 -0600
Subject: [PATCH 01/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Set store_id to 0 to allow for store-agnostic product conditions
---
 app/code/Magento/CatalogWidget/Block/Product/ProductsList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 2b95de24d0201..fa3b0ca03d42c 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -250,7 +250,7 @@ public function createCollection()
         $collection->setVisibility($this->catalogProductVisibility->getVisibleInCatalogIds());
 
         $collection = $this->_addProductAttributesAndPrices($collection)
-            ->addStoreFilter()
+            ->addStoreFilter($this->getData('store_id'))
             ->setPageSize($this->getPageSize())
             ->setCurPage($this->getRequest()->getParam($this->getData('page_var_name'), 1));
 

From d72f2b9da2c8d759d2531a5ec100640af442bb6e Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Tue, 18 Dec 2018 13:39:11 -0600
Subject: [PATCH 02/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Remove temporal coupling by immediately setting store_id first on collection if it is available
---
 .../Magento/CatalogWidget/Block/Product/ProductsList.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index fa3b0ca03d42c..33cd204ced376 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -247,10 +247,15 @@ public function createCollection()
     {
         /** @var $collection \Magento\Catalog\Model\ResourceModel\Product\Collection */
         $collection = $this->productCollectionFactory->create();
+
+        if ($this->getData('store_id') !== null) {
+            $collection->setStoreId($this->getData('store_id'));
+        }
+
         $collection->setVisibility($this->catalogProductVisibility->getVisibleInCatalogIds());
 
         $collection = $this->_addProductAttributesAndPrices($collection)
-            ->addStoreFilter($this->getData('store_id'))
+            ->addStoreFilter()
             ->setPageSize($this->getPageSize())
             ->setCurPage($this->getRequest()->getParam($this->getData('page_var_name'), 1));
 

From f17f20eaa640c86cf85aff1b51fa8ca6eb671633 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Wed, 19 Dec 2018 12:49:36 -0600
Subject: [PATCH 03/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Increase timeout for interaction with AdminStoresGridSection.storeFilterTextField
---
 .../Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
index 04cbeb5bc596e..27ef308856d60 100644
--- a/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
+++ b/app/code/Magento/Store/Test/Mftf/Section/AdminStoresGridSection.xml
@@ -14,7 +14,7 @@
     <section name="AdminStoresGridSection">
         <element name="storeGrpFilterTextField" type="input" selector="#storeGrid_filter_group_title"/>
         <element name="websiteFilterTextField" type="input" selector="#storeGrid_filter_website_title"/>
-        <element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title"/>
+        <element name="storeFilterTextField" type="input" selector="#storeGrid_filter_store_title" timeout="90"/>
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]" timeout="30"/>
         <element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
         <element name="websiteNameInFirstRow" type="text" selector=".col-website_title>a"/>

From 0547b62904f2a848c5fd5d0ffe5a46b0af5beab5 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Wed, 16 Jan 2019 13:33:51 -0600
Subject: [PATCH 04/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Support all store views for widgets contained within block
---
 app/code/Magento/Cms/Block/Widget/Block.php       | 2 +-
 app/code/Magento/Widget/Model/Template/Filter.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Block/Widget/Block.php b/app/code/Magento/Cms/Block/Widget/Block.php
index aa6aeaff4ecbe..c665f2afc5d38 100644
--- a/app/code/Magento/Cms/Block/Widget/Block.php
+++ b/app/code/Magento/Cms/Block/Widget/Block.php
@@ -83,7 +83,7 @@ protected function _beforeToHtml()
 
         if ($block && $block->isActive()) {
             try {
-                $storeId = $this->_storeManager->getStore()->getId();
+                $storeId = $this->getData('store_id') ?? $this->_storeManager->getStore()->getId();
                 $this->setText(
                     $this->_filterProvider->getBlockFilter()->setStoreId($storeId)->filter($block->getContent())
                 );
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 7c3e8e467e038..c79334f67a9c3 100644
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -91,6 +91,10 @@ public function generateWidget($construction)
             $name = $params['name'];
         }
 
+        if (isset($this->_storeId) && !isset($params['store_id'])) {
+            $params['store_id'] = $this->_storeId;
+        }
+
         // validate required parameter type or id
         if (!empty($params['type'])) {
             $type = $params['type'];

From 32458b72a1fa57c9f0684dd32aa441d162d064e1 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Thu, 24 Jan 2019 15:12:42 -0600
Subject: [PATCH 05/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Upgrade AdminCreateStoreViewActionGroup
---
 .../Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 6cbbb7ae22014..a796eca53d38e 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -15,6 +15,7 @@
         </arguments>
         <amOnPage url="{{AdminSystemStoreViewPage.url}}" stepKey="navigateToNewStoreView"/>
         <waitForPageLoad stepKey="waitForPageLoad1" />
+        <comment userInput="Creating Store View" stepKey="storeViewCreationComment" />
         <!--Create Store View-->
         <selectOption selector="{{AdminNewStoreSection.storeGrpDropdown}}" userInput="{{StoreGroup.name}}" stepKey="selectStore" />
         <fillField selector="{{AdminNewStoreSection.storeNameTextField}}" userInput="{{customStore.name}}" stepKey="enterStoreViewName" />
@@ -22,9 +23,11 @@
         <selectOption selector="{{AdminNewStoreSection.statusDropdown}}" userInput="Enabled" stepKey="setStatus" />
         <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreView" />
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
-        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning" />
-        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="dismissModal" />
-        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete" />
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal" />
+        <waitForPageLoad stepKey="waitForStoreListPageLoad" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload" time="30" />
+        <see userInput="You saved the store view." stepKey="seeSavedMessage" />
     </actionGroup>
     <!--Save the Store view-->
     <actionGroup name="AdminCreateStoreViewActionSaveGroup">

From 1142c6acf384c997d09483d73ac64d5106f2498b Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Tue, 29 Jan 2019 11:53:14 -0600
Subject: [PATCH 06/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Revert some of AdminCreateStoreViewActionGroup success assertions since some tests expect failure
---
 .../Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index a796eca53d38e..d23318a068b5a 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -25,9 +25,7 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete" />
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal" />
-        <waitForPageLoad stepKey="waitForStoreListPageLoad" />
-        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageReload" time="30" />
-        <see userInput="You saved the store view." stepKey="seeSavedMessage" />
+        <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
     </actionGroup>
     <!--Save the Store view-->
     <actionGroup name="AdminCreateStoreViewActionSaveGroup">

From 51dedc630af3dcdf6c30037aee78e1491bcc25ac Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Tue, 29 Jan 2019 13:51:18 -0600
Subject: [PATCH 07/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Add waitForPageLoad to AdminCreateStoreViewActionGroup
---
 .../Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index d23318a068b5a..17f15a40d4e46 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -25,6 +25,7 @@
         <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModal" />
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarningAboutTakingALongTimeToComplete" />
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmModal" />
+        <waitForPageLoad stepKey="waitForStorePageLoad" />
         <waitForElementNotVisible selector="{{AdminNewStoreViewActionsSection.loadingMask}}" stepKey="waitForElementVisible"/>
     </actionGroup>
     <!--Save the Store view-->

From ec3b13e1ac5ce6389b19ce74c459a712eb810fd9 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Tue, 29 Jan 2019 14:33:12 -0600
Subject: [PATCH 08/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Improve saveProductForm and SelectProductInWebsitesActionGroup action groups
---
 .../Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 28587e6405e49..336c3a015713f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -71,7 +71,9 @@
     <!--Save product and see success message-->
     <actionGroup name="saveProductForm">
         <scrollToTopOfPage stepKey="scrollTopPageProduct"/>
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct" />
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
+        <waitForPageLoad stepKey="waitForProductToSave"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
     </actionGroup>
 
@@ -258,7 +260,7 @@
             <argument name="website" type="string"/>
         </arguments>
         <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
-        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="clickToOpenProductInWebsite"/>
+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeader}}._show" visible="false" stepKey="expandSection"/>
         <waitForPageLoad stepKey="waitForPageOpened"/>
         <checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
     </actionGroup>

From bf223e083d425454986d472e6e278838146c553d Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Tue, 29 Jan 2019 14:43:54 -0600
Subject: [PATCH 09/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Fix duplicate stepkey
---
 .../Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 336c3a015713f..5e1b419f009ad 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -71,7 +71,7 @@
     <!--Save product and see success message-->
     <actionGroup name="saveProductForm">
         <scrollToTopOfPage stepKey="scrollTopPageProduct"/>
-        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct" />
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForSaveProductButton" />
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveProduct"/>
         <waitForPageLoad stepKey="waitForProductToSave"/>
         <see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>

From 4e49f06ae44111c660fe7ec9d9881c2a2d7c89b1 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Wed, 30 Jan 2019 15:47:34 -0600
Subject: [PATCH 10/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Add/use saveAndContinuePageWithSplitButton
---
 .../Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index 75e059f620c2d..35d81b224e587 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -44,4 +44,10 @@
         <waitForPageLoad stepKey="waitForPageLoad3"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
     </actionGroup>
+    <actionGroup name="saveAndContinuePageWithSplitButton">
+        <waitForElementVisible selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="" />
+        <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
+        <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
+        <waitForPageLoad stepKey="waitForPageLoadAfterClickingSave" />
+    </actionGroup>
 </actionGroups>

From 6216e1af806f831be90af19959881a01a11eafd1 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Wed, 30 Jan 2019 18:05:41 -0600
Subject: [PATCH 11/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Add missing stepKey
---
 app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index 35d81b224e587..dbcc908fc7606 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -45,7 +45,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
     </actionGroup>
     <actionGroup name="saveAndContinuePageWithSplitButton">
-        <waitForElementVisible selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="" />
+        <waitForElementVisible selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForExpandSplitButtonToBeVisible" />
         <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
         <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
         <waitForPageLoad stepKey="waitForPageLoadAfterClickingSave" />

From 7b868c42f04fa892c8e5afb146fb7695ed459e38 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Thu, 31 Jan 2019 13:12:42 -0600
Subject: [PATCH 12/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Update tests based on review feedback
---
 app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index dbcc908fc7606..a186da2ec4052 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -49,5 +49,6 @@
         <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
         <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>
         <waitForPageLoad stepKey="waitForPageLoadAfterClickingSave" />
+        <see userInput="You saved the block." stepKey="assertSaveBlockSuccessMessage"/>
     </actionGroup>
 </actionGroups>

From 74157c6fef75e265b064a9e1f67645e6910c7ad7 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Thu, 31 Jan 2019 13:18:46 -0600
Subject: [PATCH 13/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Rename saveAndContinuePageWithSplitButton to saveAndCloseCMSBlockWithSplitButton
---
 app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index a186da2ec4052..b03010ab2a2df 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -44,7 +44,7 @@
         <waitForPageLoad stepKey="waitForPageLoad3"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskOfStagingSection" />
     </actionGroup>
-    <actionGroup name="saveAndContinuePageWithSplitButton">
+    <actionGroup name="saveAndCloseCMSBlockWithSplitButton">
         <waitForElementVisible selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForExpandSplitButtonToBeVisible" />
         <click selector="{{BlockNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
         <click selector="{{BlockNewPagePageActionsSection.saveAndClose}}" stepKey="clickSaveBlock"/>

From 41c6d66e15865ac165d0645cd3143b5a8b4d4c3c Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Tue, 5 Feb 2019 12:22:01 +0100
Subject: [PATCH 14/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

- Move navigateToStorefrontForCreatedPage into CE
---
 .../Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index 9310e341b8f82..a4ea60a41e871 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -54,7 +54,6 @@
         <waitForPageLoad stepKey="waitForPageLoad4"/>
         <see userInput="You deleted the block." stepKey="VerifyBlockIsDeleted"/>
     </actionGroup>
-
     <actionGroup name="AddStoreViewToCmsPage" extends="navigateToCreatedCMSPage">
         <arguments>
             <argument name="storeViewName" type="string"/>
@@ -77,4 +76,11 @@
         <waitForPageLoad stepKey="waitForPageLoadAfterClickingSave" />
         <see userInput="You saved the block." stepKey="assertSaveBlockSuccessMessage"/>
     </actionGroup>
+    <actionGroup name="navigateToStorefrontForCreatedPage">
+        <arguments>
+            <argument name="page" type="string"/>
+        </arguments>
+        <amOnPage url="{{page}}" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
 </actionGroups>

From 8704f0e7c5c386f6926e72a97bc4169034ed3c1b Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Tue, 5 Feb 2019 13:16:13 +0100
Subject: [PATCH 15/20] MC-13728: Move MFTF Content From PageBuilder to CE/EE
 That Does Not Belong in PageBuilder

- Move action groups, section and data from Page Builder into core modules
---
 .../ActionGroup/AdminProductActionGroup.xml   | 43 +++++++++++++++++++
 .../AdminProductAttributeActionGroup.xml      | 17 ++++++++
 .../AdminProductGridActionGroup.xml           | 11 +++++
 .../Test/Mftf/Data/ProductAttributeData.xml   | 23 ++++++++++
 .../Mftf/Data/ProductAttributeSetData.xml     |  6 +++
 .../Catalog/Test/Mftf/Data/ProductData.xml    |  9 ++++
 .../AdminEditProductAttributesSection.xml     |  2 +
 ...inProductRelatedUpSellCrossSellSection.xml |  5 +++
 .../Test/Mftf/ActionGroup/CMSActionGroup.xml  | 40 ++++++++++++++++-
 .../Cms/Test/Mftf/Data/CmsPageData.xml        |  9 ++++
 .../Cms/Test/Mftf/Section/TinyMCESection.xml  |  2 +
 .../Test/Mftf/Section/GeneralSection.xml      |  1 +
 .../AdminCreateStoreViewActionGroup.xml       | 23 ++++++++++
 13 files changed, 190 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 28587e6405e49..2b8c1e14dd50a 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -328,4 +328,47 @@
         </assertEquals>
     </actionGroup>
 
+    <actionGroup name="expandAdminProductSection">
+        <arguments>
+            <argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
+            <argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}._show" type="string"/>
+        </arguments>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
+        <conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
+        <waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>
+    </actionGroup>
+    <actionGroup name="navigateToCreatedProductEditPage">
+        <arguments>
+            <argument name="product" defaultValue="_defaultProduct"/>
+        </arguments>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToAdminProductIndexPage"/>
+        <waitForPageLoad stepKey="waitForProductIndexPageToLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <waitForPageLoad stepKey="waitForClearFilters"/>
+        <dontSeeElement selector="{{AdminProductGridFilterSection.clearFilters}}" stepKey="dontSeeClearFilters"/>
+        <click selector="{{AdminProductGridFilterSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
+        <click selector="{{AdminProductGridFilterSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
+        <waitForPageLoad stepKey="waitForResetToDefaultView"/>
+        <see selector="{{AdminProductGridFilterSection.viewDropdown}}" userInput="Default View" stepKey="seeDefaultViewSelected"/>
+        <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForPageLoad stepKey="waitForFilterOnGrid"/>
+        <click selector="{{AdminProductGridSection.selectRowBasedOnName(product.name)}}" stepKey="clickProduct"/>
+        <waitForPageLoad stepKey="waitForProductEditPageLoad"/>
+        <waitForElementVisible selector="{{AdminProductFormBundleSection.productSku}}" stepKey="waitForProductSKUField"/>
+        <seeInField selector="{{AdminProductFormBundleSection.productSku}}" userInput="{{product.sku}}" stepKey="seeProductSKU"/>
+    </actionGroup>
+    <actionGroup name="addUpSellProductBySku" extends="addRelatedProductBySku">
+        <click selector="{{AdminProductFormRelatedUpSellCrossSellSection.AddUpSellProductsButton}}" stepKey="clickAddRelatedProductButton"/>
+        <conditionalClick selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
+        <fillField selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.skuFilter}}" userInput="{{sku}}" stepKey="fillProductSkuFilter"/>
+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}} {{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
+        <waitForPageLoad stepKey="waitForPageToLoad"/>
+        <click selector="{{AdminAddUpSellProductsModalSection.Modal}}{{AdminProductModalSlideGridSection.productGridXRowYColumnButton('1', '1')}}" stepKey="selectProduct"/>
+        <click selector="{{AdminAddUpSellProductsModalSection.AddSelectedProductsButton}}" stepKey="addRelatedProductSelected"/>
+        <waitForPageLoad stepKey="waitForPageToLoad1"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
index 8f8a86ac5adf1..38ceead527e6e 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeActionGroup.xml
@@ -63,4 +63,21 @@
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}"
                     stepKey="waitForSuccessMessage"/>
     </actionGroup>
+    <actionGroup name="saveProductAttribute">
+        <waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForAttributeToSave"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="confirmChangeInputTypeModal">
+        <waitForElementVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="waitForChangeInputTypeButton"/>
+        <click selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostConfirmButton}}" stepKey="clickChangeInputTypeButton"/>
+        <waitForElementNotVisible selector="{{AdminEditProductAttributesSection.ProductDataMayBeLostModal}}" stepKey="waitForChangeInputTypeModalGone"/>
+    </actionGroup>
+    <actionGroup name="saveProductAttributeInUse">
+        <waitForElementVisible selector="{{AttributePropertiesSection.Save}}" stepKey="waitForSaveButton"/>
+        <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForAttributeToSave"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
index 817da18f5f2b7..0817d12e3e218 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml
@@ -248,4 +248,15 @@
         <waitForLoadingMaskToDisappear stepKey="waitForMaskToDisappear"/>
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial2"/>
     </actionGroup>
+
+    <actionGroup name="NavigateToAndResetProductGridToDefaultView" extends="resetProductGridToDefaultView">
+        <amOnPage url="{{AdminProductIndexPage.url}}" before="clickClearFilters" stepKey="goToAdminProductIndexPage"/>
+        <waitForPageLoad after="goToAdminProductIndexPage" stepKey="waitForProductIndexPageToLoad"/>
+    </actionGroup>
+    <actionGroup name="NavigateToAndResetProductAttributeGridToDefaultView">
+        <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
index b367cdcab9d8b..03a004e500aef 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml
@@ -115,4 +115,27 @@
         <data key="used_for_sort_by">true</data>
         <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
     </entity>
+    <entity name="productAttributeText" type="ProductAttribute">
+        <data key="attribute_code" unique="suffix">attribute</data>
+        <data key="frontend_input">text</data>
+        <data key="scope">global</data>
+        <data key="is_required">false</data>
+        <data key="is_unique">false</data>
+        <data key="is_searchable">false</data>
+        <data key="is_visible">true</data>
+        <data key="backend_type">text</data>
+        <data key="is_wysiwyg_enabled">false</data>
+        <data key="is_visible_in_advanced_search">false</data>
+        <data key="is_visible_on_front">true</data>
+        <data key="is_filterable">false</data>
+        <data key="is_filterable_in_search">false</data>
+        <data key="used_in_product_listing">false</data>
+        <data key="is_used_for_promo_rules">false</data>
+        <data key="is_comparable">true</data>
+        <data key="is_used_in_grid">false</data>
+        <data key="is_visible_in_grid">false</data>
+        <data key="is_filterable_in_grid">false</data>
+        <data key="used_for_sort_by">false</data>
+        <requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
index 68f51559a9f31..713c453bb7ad4 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeSetData.xml
@@ -14,4 +14,10 @@
         <data key="attributeGroupId">7</data>
         <data key="sortOrder">0</data>
     </entity>
+    <entity name="AddToDefaultSetSortOrder1" type="ProductAttributeSet">
+        <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="attributeSetId">4</data>
+        <data key="attributeGroupId">7</data>
+        <data key="sortOrder">1</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index b6442a1af3ff7..2d11c48aad341 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -519,4 +519,13 @@
         <data key="filename">magento3</data>
         <data key="file_extension">jpg</data>
     </entity>
+    <entity name="ProductShortDescription" type="ProductAttribute">
+        <data key="attribute_code">short_description</data>
+    </entity>
+    <entity name="AddToDefaultSetTopOfContentSection" type="ProductAttributeSet">
+        <var key="attributeCode" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="attributeSetId">4</data>
+        <data key="attributeGroupId">13</data>
+        <data key="sortOrder">0</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
index 5df17cb4f5a42..63bdcd52cdd20 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminEditProductAttributesSection.xml
@@ -18,6 +18,8 @@
         <element name="AttributeDescription" type="text" selector="#description"/>
         <element name="ChangeAttributeDescriptionToggle" type="checkbox" selector="#toggle_description"/>
         <element name="Save" type="button" selector="button[title=Save]" timeout="30"/>
+        <element name="ProductDataMayBeLostModal" type="button" selector="//aside[contains(@class,'_show')]//header[contains(.,'Product data may be lost')]"/>
+        <element name="ProductDataMayBeLostConfirmButton" type="button" selector="//aside[contains(@class,'_show')]//button[.='Change Input Type']"/>
         <element name="defaultLabel" type="text" selector="//td[contains(text(), '{{attributeName}}')]/following-sibling::td[contains(@class, 'col-frontend_label')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
index e90d806805f7c..be046955a66a5 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductRelatedUpSellCrossSellSection.xml
@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductFormRelatedUpSellCrossSellSection">
         <element name="AddRelatedProductsButton" type="button" selector="button[data-index='button_related']" timeout="30"/>
+        <element name="AddUpSellProductsButton" type="button" selector="button[data-index='button_upsell']" timeout="30"/>
         <element name="relatedProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='related']"/>
         <element name="upSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='upsell']"/>
         <element name="crossSellProductSectionText" type="text" selector=".fieldset-wrapper.admin__fieldset-section[data-index='crosssell']"/>
@@ -18,4 +19,8 @@
         <element name="selectedRelatedProduct" type="block" selector="//span[@data-index='name']"/>
         <element name="removeRelatedProduct" type="button" selector="//span[text()='Related Products']//..//..//..//span[text()='{{productName}}']//..//..//..//..//..//button[@class='action-delete']" parameterized="true"/>
     </section>
+    <section name="AdminAddUpSellProductsModalSection">
+        <element name="Modal" type="button" selector=".product_form_product_form_related_upsell_modal"/>
+        <element name="AddSelectedProductsButton" type="button" selector="//aside[contains(@class, 'product_form_product_form_related_upsell_modal')]//button/span[contains(text(), 'Add Selected Products')]" timeout="30"/>
+    </section>
 </sections>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index e7379d3c7336f..676dd899c6f09 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -54,7 +54,6 @@
         <waitForPageLoad stepKey="waitForPageLoad4"/>
         <see userInput="You deleted the block." stepKey="VerifyBlockIsDeleted"/>
     </actionGroup>
-
     <actionGroup name="AddStoreViewToCmsPage" extends="navigateToCreatedCMSPage">
         <arguments>
             <argument name="storeViewName" type="string"/>
@@ -70,4 +69,43 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see userInput="You saved the page." stepKey="seeMessage"/>
     </actionGroup>
+    <actionGroup name="navigateToStorefrontForCreatedPage">
+        <arguments>
+            <argument name="page" type="string"/>
+        </arguments>
+        <amOnPage url="{{page}}" stepKey="goToStorefront"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+    <actionGroup name="saveCMSBlock">
+        <waitForElementVisible selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="waitForSaveButton"/>
+        <click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <see userInput="You saved the block." stepKey="seeSuccessfulSaveMessage"/>
+    </actionGroup>
+    <actionGroup name="saveAndContinueEditCmsPage">
+        <waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveAndContinueVisibility"/>
+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveAndContinueEditCmsPage"/>
+        <waitForPageLoad stepKey="waitForCmsPageLoad"/>
+        <waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.cmsPageTitle}}" stepKey="waitForCmsPageSaveButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+    </actionGroup>
+    <actionGroup name="saveCmsPage">
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="waitForSplitButton"/>
+        <click selector="{{CmsNewPagePageActionsSection.expandSplitButton}}" stepKey="expandSplitButton"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="waitForSaveCmsPage"/>
+        <click selector="{{CmsNewPagePageActionsSection.savePage}}" stepKey="clickSaveCmsPage"/>
+        <waitForElementVisible time="1" selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="waitForCmsPageSaveButton"/>
+        <see userInput="You saved the page." selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="assertSavePageSuccessMessage"/>
+    </actionGroup>
+    <actionGroup name="setLayout">
+        <arguments>
+            <argument name="designSection"/>
+            <argument name="layoutOption"/>
+        </arguments>
+        <waitForElementVisible selector="{{designSection.DesignTab}}" stepKey="waitForDesignTabVisible"/>
+        <conditionalClick selector="{{designSection.DesignTab}}" dependentSelector="{{designSection.LayoutDropdown}}" visible="false" stepKey="clickOnDesignTab"/>
+        <waitForPageLoad stepKey="waitForPageLoadDesignTab"/>
+        <waitForElementVisible selector="{{designSection.LayoutDropdown}}" stepKey="waitForLayoutDropDown" />
+        <selectOption selector="{{designSection.LayoutDropdown}}" userInput="{{layoutOption}}" stepKey="selectLayout"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
index d8a8401c31f15..2ec2eccba2344 100644
--- a/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/CmsPageData.xml
@@ -86,4 +86,13 @@
         <data key="content">1&lt;br/&gt;2&lt;br/&gt;3&lt;br/&gt;4&lt;br/&gt;5&lt;br/&gt;6&lt;br/&gt;7&lt;br/&gt;8&lt;br/&gt;9&lt;br/&gt;10&lt;br/&gt;11&lt;br/&gt;12&lt;br/&gt;13&lt;br/&gt;14&lt;br/&gt;15&lt;br/&gt;16&lt;br/&gt;17&lt;br/&gt;18&lt;br/&gt;19&lt;br/&gt;20&lt;br/&gt;line21&lt;br/&gt;22&lt;br/&gt;23&lt;br/&gt;24&lt;br/&gt;25&lt;br/&gt;26&lt;br/&gt;line27&lt;br/&gt;2&lt;br/&gt;3&lt;br/&gt;4&lt;br/&gt;5</data>
         <data key="identifier" unique="suffix">test-page-</data>
     </entity>
+    <entity name="_emptyCmsPage" type="cms_page">
+        <data key="title" unique="suffix">Test CMS Page</data>
+        <data key="identifier" unique="suffix">test-page-</data>
+    </entity>
+    <entity name="_emptyCmsBlock" type="block">
+        <data key="title" unique="suffix">Test CMS Block</data>
+        <data key="identifier" unique="suffix" >block</data>
+        <data key="active">true</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index 89431a0c7ce4d..106a878f29ecf 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -111,5 +111,7 @@
         <element name="CompareBtn" type="button" selector=".action.tocompare"/>
         <element name="ClearCompare" type="button" selector="#compare-clear-all"/>
         <element name="AcceptClear" type="button" selector=".action-primary.action-accept" />
+        <element name="SelectPageButton" type="button" selector="//button[@title='Select Page...']"/>
+        <element name="generalFilter" type="input" selector="input.admin__control-text[name='{{arg1}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
index 66b40f74d8e98..d007c860782aa 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/GeneralSection.xml
@@ -17,6 +17,7 @@
         <element name="Switcher" type="button" selector="#cms_wysiwyg_editor" />
         <element name="StaticURL" type="button" selector="#cms_wysiwyg_use_static_urls_in_catalog" />
         <element name="Save" type="button" selector="#save" timeout="30"/>
+        <element name="StoreConfigurationPageSuccessMessage" type="text" selector="#messages [data-ui-id='messages-message-success']"/>
     </section>
     <section name="WebSection">
         <element name="DefaultLayoutsTab" type="button" selector="#web_default_layouts-head"/>
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
index 6cbbb7ae22014..e644e96047627 100644
--- a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateStoreViewActionGroup.xml
@@ -37,4 +37,27 @@
         <waitForLoadingMaskToDisappear stepKey="waitForForm"/>
         <see userInput="Store with the same code already exists." stepKey="seeMessage" />
     </actionGroup>
+    <actionGroup name="navigateToAdminContentManagementPage">
+        <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+    </actionGroup>
+    <actionGroup name="saveStoreConfiguration">
+        <comment userInput="saveStoreConfiguration" stepKey="comment"/>
+        <waitForElementVisible selector="{{StoreConfigSection.Save}}" stepKey="waitForSaveButton"/>
+        <click selector="{{StoreConfigSection.Save}}" stepKey="clickSaveButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+    <actionGroup name="saveStoreConfigurationAndValidateFieldError">
+        <arguments>
+            <argument name="inputFieldError" type="string"/>
+            <argument name="errorMessageSelector" type="string"/>
+            <argument name="errorMessage" type="string"/>
+        </arguments>
+        <comment userInput="saveStoreConfigurationAndValidateFieldError" stepKey="comment"/>
+        <waitForElementVisible selector="{{StoreConfigSection.Save}}" stepKey="waitForSaveButton"/>
+        <click selector="{{StoreConfigSection.Save}}" stepKey="clickSaveButton"/>
+        <waitForElement selector="{{inputFieldError}}" stepKey="waitForErrorField"/>
+        <waitForElementVisible selector="{{errorMessageSelector}}" stepKey="waitForErrorMessage"/>
+        <see selector="{{errorMessageSelector}}" userInput="{{errorMessage}}" stepKey="seeErrorMessage"/>
+    </actionGroup>
 </actionGroups>

From 53a77068abf819196adb1eceede30e43b7786c93 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Wed, 6 Feb 2019 13:14:03 -0600
Subject: [PATCH 16/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Stabilize AdminReviewOrderWithOnlyReportsPermissionTest
- Clear filters before attempting to click on product
- WaitForPageLoad after clicking on user in user table list
---
 .../Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
index 7f1ed3be1ca57..74124f366a54b 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
@@ -13,6 +13,7 @@
         </arguments>
         <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
         <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.username)}}"/>
+        <waitForPageLoad stepKey="waitForSingleUserPageToLoad" />
         <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <scrollToTopOfPage stepKey="scrollToTop"/>
         <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>

From 7069fac027be80d4a5841b798ba9ff3bdca1ed81 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Wed, 6 Feb 2019 17:15:56 -0600
Subject: [PATCH 17/20] MC-5373: Product couldn't be pulled to CMS Page when it
 was assigned to a specific website

Delete Storeview in AdminCreateStoreViewTest
---
 .../Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
index e7a3d03f337db..af8aceed07f0f 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminCreateStoreViewTest.xml
@@ -33,6 +33,9 @@
             <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreView2" />
             <actionGroup ref="AdminCreateStoreViewCodeUniquenessActionGroup" stepKey="createStoreViewCode" />
             <after>
+                <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreView">
+                    <argument name="customStore" value="customStore"/>
+                </actionGroup>
                 <actionGroup ref="logout" stepKey="logout"/>
             </after>
         </test>

From 0b45ef124ca3f7a200c99ea580c1e4b3a9cc3e91 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Thu, 7 Feb 2019 14:13:41 +0100
Subject: [PATCH 18/20] MC-13728: Move MFTF Content From PageBuilder to CE/EE
 That Does Not Belong in PageBuilder

- Remove duplicate action group
- Import navigateToStoreFrontWithStoreView
---
 .../Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index d38134b3b2fd3..03d638dcab658 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -83,12 +83,13 @@
         <amOnPage url="{{page}}" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
-    <actionGroup name="navigateToStorefrontForCreatedPage">
+    <actionGroup name="navigateToStoreFrontWithStoreView">
         <arguments>
-            <argument name="page" type="string"/>
+            <argument name="contentType"/>
+            <argument name="storeView"/>
         </arguments>
-        <amOnPage url="{{page}}" stepKey="goToStorefront"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <amOnPage url="{{storeView.code}}/{{contentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnStoreFrontPage"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
     </actionGroup>
     <actionGroup name="saveCMSBlock">
         <waitForElementVisible selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="waitForSaveButton"/>

From b0712a0fa8ca363d9aece843c97b2566dce62986 Mon Sep 17 00:00:00 2001
From: Dave Macaulay <macaulay@adobe.com>
Date: Thu, 7 Feb 2019 16:20:21 +0100
Subject: [PATCH 19/20] MC-13728: Move MFTF Content From PageBuilder to CE/EE
 That Does Not Belong in PageBuilder

- Remove hardcoded selectors in actiongroup
- Move PageBuilder action group back to Page Builder
---
 .../Test/Mftf/ActionGroup/AdminProductActionGroup.xml     | 4 ++--
 .../Test/Mftf/Section/AdminProductContentSection.xml      | 1 +
 .../Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml  | 8 --------
 app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index c4c7f709ab91f..dc0297d4d4986 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -260,7 +260,7 @@
             <argument name="website" type="string"/>
         </arguments>
         <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="scrollToWebsites"/>
-        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeader}}._show" visible="false" stepKey="expandSection"/>
+        <conditionalClick selector="{{ProductInWebsitesSection.sectionHeader}}" dependentSelector="{{AdminProductContentSection.sectionHeaderShow}}" visible="false" stepKey="expandSection"/>
         <waitForPageLoad stepKey="waitForPageOpened"/>
         <checkOption selector="{{ProductInWebsitesSection.website(website)}}" stepKey="selectWebsite"/>
     </actionGroup>
@@ -333,7 +333,7 @@
     <actionGroup name="expandAdminProductSection">
         <arguments>
             <argument name="sectionSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}" type="string"/>
-            <argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeader}}._show" type="string"/>
+            <argument name="sectionDependentSelector" defaultValue="{{AdminProductContentSection.sectionHeaderShow}}" type="string"/>
         </arguments>
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
index 784eff12a6c04..fafae5d535546 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminProductContentSection.xml
@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminProductContentSection">
         <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
+        <element name="sectionHeaderShow" type="button" selector="div[data-index='content']._show" timeout="30"/>
         <element name="descriptionTextArea" type="textarea" selector="#product_form_description"/>
         <element name="shortDescriptionTextArea" type="textarea" selector="#product_form_short_description"/>
         <element name="sectionHeaderIfNotShowing" type="button" selector="//div[@data-index='content']//div[contains(@class, '_hide')]"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
index 03d638dcab658..07e43347d9ddd 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/CMSActionGroup.xml
@@ -83,14 +83,6 @@
         <amOnPage url="{{page}}" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
-    <actionGroup name="navigateToStoreFrontWithStoreView">
-        <arguments>
-            <argument name="contentType"/>
-            <argument name="storeView"/>
-        </arguments>
-        <amOnPage url="{{storeView.code}}/{{contentType.pageNamePrefix}}{{PageBuilderPageTitle.pageName}}" stepKey="amOnStoreFrontPage"/>
-        <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
-    </actionGroup>
     <actionGroup name="saveCMSBlock">
         <waitForElementVisible selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="waitForSaveButton"/>
         <click selector="{{CmsNewBlockBlockActionsSection.savePage}}" stepKey="clickSaveButton"/>
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index 106a878f29ecf..406090e3dc7f6 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -112,6 +112,6 @@
         <element name="ClearCompare" type="button" selector="#compare-clear-all"/>
         <element name="AcceptClear" type="button" selector=".action-primary.action-accept" />
         <element name="SelectPageButton" type="button" selector="//button[@title='Select Page...']"/>
-        <element name="generalFilter" type="input" selector="input.admin__control-text[name='{{arg1}}']" parameterized="true"/>
+        <element name="SelectPageFilterInput" type="input" selector="input.admin__control-text[name='{{arg1}}']" parameterized="true"/>
     </section>
 </sections>

From fbebd82318de822644996db4fd2cf787310a55e7 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Thu, 7 Feb 2019 13:45:14 -0600
Subject: [PATCH 20/20] MC-13728: Move MFTF Content From PageBuilder to CE/EE
 That Does Not Belong in PageBuilder

Address feedback
- Change naming of arg1 to filterName
---
 app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
index 406090e3dc7f6..8559334238d2f 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection.xml
@@ -112,6 +112,6 @@
         <element name="ClearCompare" type="button" selector="#compare-clear-all"/>
         <element name="AcceptClear" type="button" selector=".action-primary.action-accept" />
         <element name="SelectPageButton" type="button" selector="//button[@title='Select Page...']"/>
-        <element name="SelectPageFilterInput" type="input" selector="input.admin__control-text[name='{{arg1}}']" parameterized="true"/>
+        <element name="SelectPageFilterInput" type="input" selector="input.admin__control-text[name='{{filterName}}']" parameterized="true"/>
     </section>
 </sections>