From c2c9237e19dc9a474795fa5cdad33d748c76c810 Mon Sep 17 00:00:00 2001
From: Andrii Meysar <andrii.meysar@transoftgroup.com>
Date: Thu, 2 Apr 2020 12:18:57 +0300
Subject: [PATCH 1/2] MC-32934: Fix action groups.

---
 .../Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.xml | 1 +
 .../StorefrontAssertProductAbsentOnCategoryPageActionGroup.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.xml
index 564033f459dc9..5521cc2a7d0b2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminSaveCategoryFormActionGroup.xml
@@ -14,6 +14,7 @@
         </annotations>
 
         <seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfTheCategoryPage"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="saveCategory"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppears"/>
         <see userInput="You saved the category." selector="{{AdminMessagesSection.success}}" stepKey="assertSuccessMessage"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductAbsentOnCategoryPageActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductAbsentOnCategoryPageActionGroup.xml
index 4c641b621a504..0effec5329cc0 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductAbsentOnCategoryPageActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontAssertProductAbsentOnCategoryPageActionGroup.xml
@@ -10,7 +10,8 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontAssertProductAbsentOnCategoryPageActionGroup">
         <annotations>
-            <description>Navigate to category page and verify product is absent.</description>
+            <description>DEPRECATED. Please use AssertStorefrontProductAbsentOnCategoryPageActionGroup instead.
+                Navigate to category page and verify product is absent.</description>
         </annotations>
         <arguments>
             <argument name="category" defaultValue="_defaultCategory"/>

From f30de938ab66ffd6ba7024f70c43afab2d85d3f0 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 2 Apr 2020 14:08:38 +0300
Subject: [PATCH 2/2] MC-32907: [FT] [MFTF] Add section

---
 .../Checkout/Test/Mftf/Page/CheckoutPage.xml       |  1 +
 .../StorefrontCheckoutPageMessagesSection.xml      | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPageMessagesSection.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
index d6173dfa17916..a021ce6c93e63 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/CheckoutPage.xml
@@ -9,6 +9,7 @@
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
     <page name="CheckoutPage" url="/checkout" area="storefront" module="Magento_Checkout">
+        <section name="StorefrontCheckoutPageMessagesSection"/>
         <section name="CheckoutShippingSection"/>
         <section name="CheckoutShippingMethodsSection"/>
         <section name="CheckoutOrderSummarySection"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPageMessagesSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPageMessagesSection.xml
new file mode 100644
index 0000000000000..4cedf837918c5
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPageMessagesSection.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="StorefrontCheckoutPageMessagesSection">
+        <element name="successMessage" type="text" selector="//div[@id='checkout']//div[@data-role='checkout-messages']//div[contains(@class,'message-success')]//div[contains(.,'{{message}}')]" parameterized="true"/>
+    </section>
+</sections>