From 4f2d8de0f36132cab835e5af3bc88d461e87967f Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 6 Aug 2020 11:47:05 +0530
Subject: [PATCH 01/24] Added sticky in lac banner

---
 .../frontend/templates/html/notices.phtml     |  4 +-
 .../view/frontend/web/css/source/_module.less | 64 ++++++++++---------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml
index aa64e78aa234f..b2e0aaf20ce34 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/templates/html/notices.phtml
@@ -11,7 +11,9 @@
 $viewFileUrl = $block->getViewFileUrl('Magento_LoginAsCustomerFrontendUi::images/magento-icon.svg');
 ?>
 <?php if ($block->getConfig()->isEnabled()): ?>
-    <div  data-bind="scope: 'loginAsCustomer'" >
+    <div class="lac-notification-sticky"
+         data-mage-init='{"sticky":{"container": "body"}}'
+         data-bind="scope: 'loginAsCustomer'" >
         <div class="lac-notification clearfix" data-bind="visible: isVisible" style="display: none">
             <div class="top-container">
                 <div class="lac-notification-icon wrapper">
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/css/source/_module.less b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/css/source/_module.less
index d630ff06c3e34..c42f5143b4fda 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/css/source/_module.less
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/view/frontend/web/css/source/_module.less
@@ -16,43 +16,47 @@
 //  ---------------------------------------------
 
 & when (@media-common = true) {
-    .lac-notification {
-        background-color: @lac-notification-background-color;
-        color: @lac-notification-color;
-        font-size: 16px;
+    .lac-notification-sticky {
+        position: relative;
+        z-index: 999;
+        .lac-notification {
+            background-color: @lac-notification-background-color;
+            color: @lac-notification-color;
+            font-size: 16px;
 
-        .lac-notification-icon {
-            float: left;
-            margin: 10px 25px 10px 10px;
+            .lac-notification-icon {
+                float: left;
+                margin: 10px 25px 10px 10px;
 
-            .logo-img {
-                display: block
+                .logo-img {
+                    display: block
+                }
             }
-        }
 
-        .lac-notification-text {
-            float: left;
-            padding: 15px 0;
-        }
+            .lac-notification-text {
+                float: left;
+                padding: 15px 0;
+            }
 
-        .lac-notification-links {
-            float: right;
-            padding: 15px 0;
+            .lac-notification-links {
+                float: right;
+                padding: 15px 0;
 
-            a {
-                color: @lac-notification-links-color;
-                font-size: 14px;
-            }
+                a {
+                    color: @lac-notification-links-color;
+                    font-size: 14px;
+                }
 
-            .lac-notification-close-link {
-                &:after {
-                    background: url('../Magento_LoginAsCustomerFrontendUi/images/close.svg');
-                    content: ' ';
-                    display: inline-block;
-                    height: 12px;
-                    margin-left: 5px;
-                    vertical-align: middle;
-                    width: 12px;
+                .lac-notification-close-link {
+                    &:after {
+                        background: url('../Magento_LoginAsCustomerFrontendUi/images/close.svg');
+                        content: ' ';
+                        display: inline-block;
+                        height: 12px;
+                        margin-left: 5px;
+                        vertical-align: middle;
+                        width: 12px;
+                    }
                 }
             }
         }

From 43cca51a6d361c73bfebcbeeebf2430e345b5157 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 6 Aug 2020 16:20:05 +0530
Subject: [PATCH 02/24] MFTF test added

---
 ...oginAsCustomerBannerVisibleActionGroup.xml | 20 +++++++++++
 .../StorefrontLoginToCustomerActionGroup.xml  | 22 ++++++++++++
 ...orefrontCustomerLoginAsCustomerSection.xml | 15 ++++++++
 .../StorefrontLoginAsCustomerBannerTest.xml   | 35 +++++++++++++++++++
 4 files changed, 92 insertions(+)
 create mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerBannerVisibleActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontLoginToCustomerActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Section/StorefrontCustomerLoginAsCustomerSection.xml
 create mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Test/StorefrontLoginAsCustomerBannerTest.xml

diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerBannerVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerBannerVisibleActionGroup.xml
new file mode 100644
index 0000000000000..c37cf089398dc
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerBannerVisibleActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="StorefrontAssertLoginAsCustomerBannerVisibleActionGroup">
+        <annotations>
+            <description>Assert Login As Customer Banner is sticky</description>
+        </annotations>
+
+        <seeElement selector="{{StorefrontCustomerLoginAsCustomerSection.loginAsCustomerBanner}}" stepKey="verifyBannerIsVisibleBeforeScroll"/>
+        <scrollTo selector="{{StorefrontCustomerLoginAsCustomerSection.copyright}}" stepKey="scrollToEndOfThePage" />
+        <seeElement selector="{{StorefrontCustomerLoginAsCustomerSection.loginAsCustomerBanner}}" stepKey="verifyBannerIsVisibleAfterScroll"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontLoginToCustomerActionGroup.xml b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontLoginToCustomerActionGroup.xml
new file mode 100644
index 0000000000000..2227cd4a3109c
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontLoginToCustomerActionGroup.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="StorefrontLoginToCustomerActionGroup">
+        <annotations>
+            <description>Login to customer account using Login As customer.</description>
+        </annotations>
+        <arguments>
+            <argument name="customerId" type="string"/>
+        </arguments>
+
+        <amOnPage url="admin/loginascustomer/login/login/customer_id/{{customerId}}/" stepKey="loginAsCustomer"/>
+        <waitForElementVisible selector="{{StorefrontCustomerLoginAsCustomerSection.loginAsCustomerBanner}}" stepKey="waitForLoginAsCustomerPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Section/StorefrontCustomerLoginAsCustomerSection.xml b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Section/StorefrontCustomerLoginAsCustomerSection.xml
new file mode 100644
index 0000000000000..a58fcab7145d5
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Section/StorefrontCustomerLoginAsCustomerSection.xml
@@ -0,0 +1,15 @@
+<?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="StorefrontCustomerLoginAsCustomerSection">
+        <element name="loginAsCustomerBanner" type="text" selector=".lac-notification-sticky" timeout="30"/>
+        <element name="copyright" type="text" selector=".copyright" timeout="30"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Test/StorefrontLoginAsCustomerBannerTest.xml b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Test/StorefrontLoginAsCustomerBannerTest.xml
new file mode 100644
index 0000000000000..04b0acca3be63
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Test/StorefrontLoginAsCustomerBannerTest.xml
@@ -0,0 +1,35 @@
+<?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="StorefrontLoginAsCustomerBannerTest">
+        <annotations>
+            <features value="StorefrontLoginAsCustomerBanner"/>
+            <stories value="User login as customer and verify banner is sticky"/>
+            <useCaseId value="https://github.com/magento/magento2/issues/29354"/>
+            <title value="User login as customer and verify banner is sticky"/>
+            <testCaseId value=""/>
+            <description value="User login as customer and verify banner is sticky"/>
+            <severity value="CRITICAL"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer" />
+        </after>
+
+        <actionGroup ref="StorefrontLoginToCustomerActionGroup" stepKey="LoginAsCustomer">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertLoginAsCustomerBannerVisibleActionGroup" stepKey="assertBannerIsSticky" />
+    </test>
+</tests>

From 804ed717fbe4ece509cb7cac483ff0aa8945770f Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 7 Aug 2020 12:36:07 +0530
Subject: [PATCH 03/24] refactoring MFTF test

---
 ...sCustomerNotificationBannerActionGroup.xml | 33 ++++++++++++
 ...yLoginAsCustomerNotificationBannerTest.xml | 51 +++++++++++++++++++
 ...oginAsCustomerBannerVisibleActionGroup.xml | 20 --------
 .../StorefrontLoginToCustomerActionGroup.xml  | 22 --------
 ...orefrontCustomerLoginAsCustomerSection.xml | 15 ------
 .../StorefrontLoginAsCustomerBannerTest.xml   | 35 -------------
 6 files changed, 84 insertions(+), 92 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
 delete mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerBannerVisibleActionGroup.xml
 delete mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontLoginToCustomerActionGroup.xml
 delete mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Section/StorefrontCustomerLoginAsCustomerSection.xml
 delete mode 100644 app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Test/StorefrontLoginAsCustomerBannerTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
new file mode 100644
index 0000000000000..46f582ca6d44e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
@@ -0,0 +1,33 @@
+<?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="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup">
+        <annotations>
+            <description>Verify Sticky Login as Customer notification banner present on page.</description>
+        </annotations>
+        <arguments>
+            <argument name="customerFullName" type="string"/>
+            <argument name="websiteName" type="string" defaultValue="Main Website"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{StorefrontLoginAsCustomerNotificationSection.notificationText}}" stepKey="waitForNotificationBanner"/>
+        <see selector="{{StorefrontLoginAsCustomerNotificationSection.notificationText}}"
+             userInput="You are connected as {{customerFullName}} on {{websiteName}}"
+             stepKey="assertCorrectNotificationBannerMessage"/>
+        <seeElement selector="{{StorefrontLoginAsCustomerNotificationSection.closeLink}}"
+             stepKey="assertCloseNotificationBannerPresent"/>
+        <executeJS function="window.scrollTo(0,document.body.scrollHeight);" stepKey="scrollToBottomOfPage"/>
+        <see selector="{{StorefrontLoginAsCustomerNotificationSection.notificationText}}"
+             userInput="You are connected as {{customerFullName}} on {{websiteName}}"
+             stepKey="assertCorrectNotificationBannerMessageAfterScroll"/>
+        <seeElement selector="{{StorefrontLoginAsCustomerNotificationSection.closeLink}}"
+                    stepKey="assertCloseNotificationBannerPresentAfterScroll"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
new file mode 100644
index 0000000000000..3368fa7e5be7a
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
@@ -0,0 +1,51 @@
+<?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="StorefrontStickyLoginAsCustomerNotificationBannerTest">
+        <annotations>
+            <features value="Login as Customer"/>
+            <useCaseId value="https://github.com/magento/magento2/issues/29354"/>
+            <stories value="Availability of sticky UI elements if module enable/disable"/>
+            <title value="Sticky Notification Banner is present on Storefront page"/>
+            <description
+                value="Verify that Sticky Notification Banner is present on page if 'Login as customer' functionality used"/>
+            <testCaseId value=""/>
+            <severity value="CRITICAL"/>
+        </annotations>
+        <before>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
+        </after>
+
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup" stepKey="assertStickyNotificationBanner">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+        </actionGroup>
+
+        <actionGroup ref="StorefrontSignOutNotificationBannerAndCloseTabActionGroup" stepKey="signOutAndCloseTab"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerBannerVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerBannerVisibleActionGroup.xml
deleted file mode 100644
index c37cf089398dc..0000000000000
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerBannerVisibleActionGroup.xml
+++ /dev/null
@@ -1,20 +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="StorefrontAssertLoginAsCustomerBannerVisibleActionGroup">
-        <annotations>
-            <description>Assert Login As Customer Banner is sticky</description>
-        </annotations>
-
-        <seeElement selector="{{StorefrontCustomerLoginAsCustomerSection.loginAsCustomerBanner}}" stepKey="verifyBannerIsVisibleBeforeScroll"/>
-        <scrollTo selector="{{StorefrontCustomerLoginAsCustomerSection.copyright}}" stepKey="scrollToEndOfThePage" />
-        <seeElement selector="{{StorefrontCustomerLoginAsCustomerSection.loginAsCustomerBanner}}" stepKey="verifyBannerIsVisibleAfterScroll"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontLoginToCustomerActionGroup.xml b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontLoginToCustomerActionGroup.xml
deleted file mode 100644
index 2227cd4a3109c..0000000000000
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/ActionGroup/StorefrontLoginToCustomerActionGroup.xml
+++ /dev/null
@@ -1,22 +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="StorefrontLoginToCustomerActionGroup">
-        <annotations>
-            <description>Login to customer account using Login As customer.</description>
-        </annotations>
-        <arguments>
-            <argument name="customerId" type="string"/>
-        </arguments>
-
-        <amOnPage url="admin/loginascustomer/login/login/customer_id/{{customerId}}/" stepKey="loginAsCustomer"/>
-        <waitForElementVisible selector="{{StorefrontCustomerLoginAsCustomerSection.loginAsCustomerBanner}}" stepKey="waitForLoginAsCustomerPageLoad"/>
-    </actionGroup>
-</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Section/StorefrontCustomerLoginAsCustomerSection.xml b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Section/StorefrontCustomerLoginAsCustomerSection.xml
deleted file mode 100644
index a58fcab7145d5..0000000000000
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Section/StorefrontCustomerLoginAsCustomerSection.xml
+++ /dev/null
@@ -1,15 +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="StorefrontCustomerLoginAsCustomerSection">
-        <element name="loginAsCustomerBanner" type="text" selector=".lac-notification-sticky" timeout="30"/>
-        <element name="copyright" type="text" selector=".copyright" timeout="30"/>
-    </section>
-</sections>
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Test/StorefrontLoginAsCustomerBannerTest.xml b/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Test/StorefrontLoginAsCustomerBannerTest.xml
deleted file mode 100644
index 04b0acca3be63..0000000000000
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Test/Mftf/Test/StorefrontLoginAsCustomerBannerTest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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="StorefrontLoginAsCustomerBannerTest">
-        <annotations>
-            <features value="StorefrontLoginAsCustomerBanner"/>
-            <stories value="User login as customer and verify banner is sticky"/>
-            <useCaseId value="https://github.com/magento/magento2/issues/29354"/>
-            <title value="User login as customer and verify banner is sticky"/>
-            <testCaseId value=""/>
-            <description value="User login as customer and verify banner is sticky"/>
-            <severity value="CRITICAL"/>
-        </annotations>
-        <before>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
-        </before>
-
-        <after>
-            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer" />
-        </after>
-
-        <actionGroup ref="StorefrontLoginToCustomerActionGroup" stepKey="LoginAsCustomer">
-            <argument name="customerId" value="$$createCustomer.id$$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerBannerVisibleActionGroup" stepKey="assertBannerIsSticky" />
-    </test>
-</tests>

From c0ca7cdf42a3f4425827fe61f4b7711ae0996e8b Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Mon, 10 Aug 2020 11:05:10 +0530
Subject: [PATCH 04/24] Feedback changes

---
 ...insMessageOrderCreatedByAdminActionGroup.xml} |  2 +-
 ...merConfigNotAvailableDirectlyActionGroup.xml} |  2 +-
 ...ginAsCustomerConfigNotVisibleActionGroup.xml} |  2 +-
 ...nLoginAsCustomerConfigVisibleActionGroup.xml} |  2 +-
 ...AdminLoginAsCustomerLogRecordActionGroup.xml} |  2 +-
 ...stomerSectionLinkNotAvailableActionGroup.xml} |  2 +-
 ...insMessageOrderCreatedByAdminActionGroup.xml} |  2 +-
 ...StorefrontCustomerOnStoreViewActionGroup.xml} |  2 +-
 ...efrontLoginAsCustomerLoggedInActionGroup.xml} |  2 +-
 ...nAsCustomerNotificationBannerActionGroup.xml} |  2 +-
 ...nAsCustomerNotificationBannerActionGroup.xml} |  2 +-
 .../AdminLoginAsCustomerAutoDetectionTest.xml    |  2 +-
 .../Test/AdminLoginAsCustomerLoggingTest.xml     |  8 ++++----
 .../AdminLoginAsCustomerManualChooseTest.xml     |  4 ++--
 ...inLoginAsCustomerMultishippingLoggingTest.xml |  8 ++++----
 .../Test/AdminLoginAsCustomerPlaceOrderTest.xml  |  4 ++--
 .../Test/AdminLoginAsCustomerReorderTest.xml     |  4 ++--
 ...stomerSettingsAvailableForGlobalLevelTest.xml |  6 +++---
 .../Test/AdminLoginAsCustomerUserLogoutTest.xml  |  2 +-
 ...AdminLoginAsCustomerUserSingleSessionTest.xml |  4 ++--
 ...oAccessToLoginAsCustomerConfigurationTest.xml |  4 ++--
 .../AdminUIShownIfLoginAsCustomerEnabledTest.xml |  4 ++--
 ...tomerBannerPresentOnAllPagesInSessionTest.xml | 16 ++++++++--------
 ...rontLoginAsCustomerNotificationBannerTest.xml |  2 +-
 ...inAsCustomerSeeSpecialPriceOnCategoryTest.xml |  2 +-
 ...rShoppingCartIsNotMergedWithGuestCartTest.xml |  2 +-
 ...ickyLoginAsCustomerNotificationBannerTest.xml |  4 ++--
 27 files changed, 49 insertions(+), 49 deletions(-)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml => AssertAdminContainsMessageOrderCreatedByAdminActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml => AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml => AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml} (90%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml => AssertAdminLoginAsCustomerConfigVisibleActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AdminAssertLoginAsCustomerLogRecordActionGroup.xml => AssertAdminLoginAsCustomerLogRecordActionGroup.xml} (94%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml => AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml => AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{StorefrontAssertCustomerOnStoreViewActionGroup.xml => AssertStorefrontCustomerOnStoreViewActionGroup.xml} (92%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml => AssertStorefrontLoginAsCustomerLoggedInActionGroup.xml} (94%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml => AssertStorefrontLoginAsCustomerNotificationBannerActionGroup.xml} (95%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml => AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml} (96%)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminContainsMessageOrderCreatedByAdminActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminContainsMessageOrderCreatedByAdminActionGroup.xml
index bcf6fc96aa131..cfab1ffc5bbf4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup">
+    <actionGroup name="AssertAdminContainsMessageOrderCreatedByAdminActionGroup">
         <annotations>
             <description>Assert Admin Order page contains message about Order created by a Store Administrator.
             </description>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
index 7e032b168f062..ec2261be6d20f 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
+    <actionGroup name="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
         <annotations>
             <description>Verify Login as Customer config section is not available by direct url.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
similarity index 90%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
index 875869d9928a4..18c1fb32a6f93 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup">
+    <actionGroup name="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup">
         <annotations>
             <description>Verify no Login as Customer config section available.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigVisibleActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigVisibleActionGroup.xml
index cdc513651ad54..9ddb439b2e5a3 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigVisibleActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminAssertLoginAsCustomerConfigVisibleActionGroup">
+    <actionGroup name="AssertAdminLoginAsCustomerConfigVisibleActionGroup">
         <annotations>
             <description>Verify Login as Customer config section available.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerLogRecordActionGroup.xml
similarity index 94%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerLogRecordActionGroup.xml
index da47864e28eac..0c35992e025f3 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerLogRecordActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminAssertLoginAsCustomerLogRecordActionGroup">
+    <actionGroup name="AssertAdminLoginAsCustomerLogRecordActionGroup">
         <annotations>
             <description>Assert Login as Customer Log record is correct.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
index 779cb1e5c8899..f05be04bc78fe 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup">
+    <actionGroup name="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup">
         <annotations>
             <description>Verify Login as Customer config section isn't available.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup.xml
index f40ea7f93c7a1..da1be5eed010f 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup">
+    <actionGroup name="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup">
         <annotations>
             <description>Verify Storefront Order page contains message about Order created by a Store Administrator.
             </description>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontCustomerOnStoreViewActionGroup.xml
similarity index 92%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontCustomerOnStoreViewActionGroup.xml
index f63cda2303526..f8c240abeb8fd 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontCustomerOnStoreViewActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontAssertCustomerOnStoreViewActionGroup">
+    <actionGroup name="AssertStorefrontCustomerOnStoreViewActionGroup">
         <annotations>
             <description>Assert Customer is on the provided Store View.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerLoggedInActionGroup.xml
similarity index 94%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerLoggedInActionGroup.xml
index bb7e938bdfb59..7badab1fc8dfd 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerLoggedInActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontAssertLoginAsCustomerLoggedInActionGroup">
+    <actionGroup name="AssertStorefrontLoginAsCustomerLoggedInActionGroup">
         <annotations>
             <description>Verify Admin successfully logged in as Customer.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerNotificationBannerActionGroup.xml
similarity index 95%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerNotificationBannerActionGroup.xml
index ce2e261f10040..a2464caa54a38 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerNotificationBannerActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup">
+    <actionGroup name="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup">
         <annotations>
             <description>Verify Login as Customer notification banner present on page.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml
similarity index 96%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml
index 46f582ca6d44e..b1b3ccd05ddfc 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup">
+    <actionGroup name="AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup">
         <annotations>
             <description>Verify Sticky Login as Customer notification banner present on page.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index 42d53113e20f4..bdfadaf378561 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -53,7 +53,7 @@
         </actionGroup>
 
         <!-- Assert Customer logged on on default store view -->
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
index bf2556b30967b..7156c407ec6fa 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
@@ -84,22 +84,22 @@
         <actionGroup ref="AdminOpenLoginAsCustomerLogActionGroup" stepKey="gotoLoginAsCustomerLog"/>
 
         <!-- Perform assertions -->
-        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord">
+        <actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord">
             <argument name="rowNumber" value="4"/>
             <argument name="adminId" value="1"/>
             <argument name="customerId" value="$$createFirstCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminSecondCustomerLogRecord">
+        <actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminSecondCustomerLogRecord">
             <argument name="rowNumber" value="3"/>
             <argument name="adminId" value="1"/>
             <argument name="customerId" value="$$createSecondCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminFirstCustomerLogRecord">
+        <actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminFirstCustomerLogRecord">
             <argument name="rowNumber" value="2"/>
             <argument name="adminId" value="$$createNewAdmin.id$$"/>
             <argument name="customerId" value="$$createFirstCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminSecondCustomerLogRecord">
+        <actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminSecondCustomerLogRecord">
             <argument name="rowNumber" value="1"/>
             <argument name="adminId" value="$$createNewAdmin.id$$"/>
             <argument name="customerId" value="$$createSecondCustomer.id$$"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index acae07d1cda11..5e6c48a10a894 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -53,11 +53,11 @@
         </actionGroup>
 
         <!-- Assert Customer logged on on custom store view -->
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
+        <actionGroup ref="AssertStorefrontCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
             <argument name="storeViewName" value="{{customStore.name}}"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
index 8e5c121fed157..9031644e438bd 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
@@ -82,19 +82,19 @@
         <waitForPageLoad stepKey="waitForOrderPageLoad"/>
 
         <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageFirstOrder">
+        <actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageFirstOrder">
             <argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageSecondOrder">
+        <actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageSecondOrder">
             <argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
         </actionGroup>
 
         <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
+        <actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
             <argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
             <argument name="adminUserFullName" value="Magento User"/>
         </actionGroup>
-        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
+        <actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
             <argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
             <argument name="adminUserFullName" value="Magento User"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
index a4994d5c041d2..f14dfe56610dc 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
@@ -81,12 +81,12 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
 
         <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
+        <actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
             <argument name="orderId" value="{$grabOrderId}"/>
         </actionGroup>
 
         <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
+        <actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
             <argument name="orderId" value="{$grabOrderId}"/>
             <argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
index 16e0b94112562..98a04cd02d40a 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
@@ -95,12 +95,12 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabReorderId"/>
 
         <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
+        <actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
             <argument name="orderId" value="${grabReorderId}"/>
         </actionGroup>
 
         <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
+        <actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
             <argument name="orderId" value="${grabReorderId}"/>
             <argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
index 807603bdcba0a..4869990ff7c42 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
@@ -25,16 +25,16 @@
         </after>
 
         <amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
-        <actionGroup ref="AdminAssertLoginAsCustomerConfigVisibleActionGroup" stepKey="seeLoginAsCustomerConfig"/>
+        <actionGroup ref="AssertAdminLoginAsCustomerConfigVisibleActionGroup" stepKey="seeLoginAsCustomerConfig"/>
 
         <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultStoreView">
             <argument name="storeViewName" value="'Default Store View'"/>
         </actionGroup>
-        <actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLinkOnStoreView"/>
+        <actionGroup ref="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLinkOnStoreView"/>
 
         <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultWebsite">
             <argument name="storeViewName" value="'Main Website'"/>
         </actionGroup>
-        <actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLink"/>
+        <actionGroup ref="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLink"/>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
index 4f484e73d580b..33cee2c230e31 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
@@ -43,7 +43,7 @@
         </actionGroup>
 
         <!-- Assert correctly logged in as Customer -->
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
index e4cd48d8e868e..0172f9febf02d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
@@ -46,7 +46,7 @@
         </actionGroup>
 
         <!-- Assert correctly logged in as First Customer -->
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromFirstCustomerPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromFirstCustomerPage">
             <argument name="customerFullName" value="$$createFirstCustomer.firstname$$ $$createFirstCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createFirstCustomer.email$$"/>
         </actionGroup>
@@ -58,7 +58,7 @@
         </actionGroup>
 
         <!-- Assert correctly logged in as Second Customer -->
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromSecondCustomerPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromSecondCustomerPage">
             <argument name="customerFullName" value="$$createSecondCustomer.firstname$$ $$createSecondCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createSecondCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
index c7f42de741862..4a9a067ebd208 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
@@ -87,10 +87,10 @@
         </actionGroup>
 
         <!-- Assert no Login as Customer config section visible -->
-        <actionGroup ref="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>
+        <actionGroup ref="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>
 
         <!-- Assert Login as Customer config section is not available by direct url -->
-        <actionGroup ref="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
+        <actionGroup ref="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
                      stepKey="assertConfigNotAvailableDirectly"/>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
index 2bf364b29ba8d..6d5787fe605db 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
@@ -48,7 +48,7 @@
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
@@ -70,7 +70,7 @@
             <argument name="orderId" value="$grabOrderId"/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
index 6874fcb4fd220..276a48923f764 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
@@ -48,20 +48,20 @@
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
         <!-- Go to Wishlist and assert notification banner -->
         <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="amOnWishListPage"/>
         <waitForPageLoad stepKey="waitForWishlistPageLoad"/>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnWishList">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnWishList">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
         <!-- Go to category page and assert notification banner -->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCategoryPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCategoryPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
@@ -69,7 +69,7 @@
         <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
             <argument name="productUrlKey" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnProductPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnProductPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
@@ -79,14 +79,14 @@
             <argument name="productCount" value="1"/>
         </actionGroup>
         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCartPage"/>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCartPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCartPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
         <!-- Proceed to checkout and assert notification banner -->
         <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
         <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCheckoutPage">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCheckoutPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
@@ -95,7 +95,7 @@
         <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerBeforePlaceOrder">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerBeforePlaceOrder">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
@@ -105,7 +105,7 @@
             <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerAfterPlaceOrder">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerAfterPlaceOrder">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
     </test>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
index d953c493562c6..5a4d5ac7b3e24 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
@@ -42,7 +42,7 @@
         </actionGroup>
 
         <!-- Assert Notification Banner is present on page -->
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
index 775fcb122e181..d22cb681afb30 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
@@ -77,7 +77,7 @@
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
index 09ec1b427f515..96d0cec0eb20e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
@@ -57,7 +57,7 @@
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
index 3368fa7e5be7a..c040351b2ef76 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
@@ -33,7 +33,7 @@
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
                         stepKey="disableLoginAsCustomer"/>
-            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushConfigCache">
                 <argument name="tags" value="config"/>
             </actionGroup>
         </after>
@@ -42,7 +42,7 @@
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup" stepKey="assertStickyNotificationBanner">
+        <actionGroup ref="AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup" stepKey="assertStickyNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 

From 425113c355ca8cb880cfec8c2c362dbfd802795a Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Mon, 17 Aug 2020 10:15:29 +0530
Subject: [PATCH 05/24] Revert "Feedback changes"

This reverts commit c0ca7cdf42a3f4425827fe61f4b7711ae0996e8b.
---
 ...insMessageOrderCreatedByAdminActionGroup.xml} |  2 +-
 ...merConfigNotAvailableDirectlyActionGroup.xml} |  2 +-
 ...ginAsCustomerConfigNotVisibleActionGroup.xml} |  2 +-
 ...tLoginAsCustomerConfigVisibleActionGroup.xml} |  2 +-
 ...ssertLoginAsCustomerLogRecordActionGroup.xml} |  2 +-
 ...stomerSectionLinkNotAvailableActionGroup.xml} |  2 +-
 ...insMessageOrderCreatedByAdminActionGroup.xml} |  2 +-
 ...rontAssertCustomerOnStoreViewActionGroup.xml} |  2 +-
 ...AssertLoginAsCustomerLoggedInActionGroup.xml} |  2 +-
 ...nAsCustomerNotificationBannerActionGroup.xml} |  2 +-
 ...nAsCustomerNotificationBannerActionGroup.xml} |  2 +-
 .../AdminLoginAsCustomerAutoDetectionTest.xml    |  2 +-
 .../Test/AdminLoginAsCustomerLoggingTest.xml     |  8 ++++----
 .../AdminLoginAsCustomerManualChooseTest.xml     |  4 ++--
 ...inLoginAsCustomerMultishippingLoggingTest.xml |  8 ++++----
 .../Test/AdminLoginAsCustomerPlaceOrderTest.xml  |  4 ++--
 .../Test/AdminLoginAsCustomerReorderTest.xml     |  4 ++--
 ...stomerSettingsAvailableForGlobalLevelTest.xml |  6 +++---
 .../Test/AdminLoginAsCustomerUserLogoutTest.xml  |  2 +-
 ...AdminLoginAsCustomerUserSingleSessionTest.xml |  4 ++--
 ...oAccessToLoginAsCustomerConfigurationTest.xml |  4 ++--
 .../AdminUIShownIfLoginAsCustomerEnabledTest.xml |  4 ++--
 ...tomerBannerPresentOnAllPagesInSessionTest.xml | 16 ++++++++--------
 ...rontLoginAsCustomerNotificationBannerTest.xml |  2 +-
 ...inAsCustomerSeeSpecialPriceOnCategoryTest.xml |  2 +-
 ...rShoppingCartIsNotMergedWithGuestCartTest.xml |  2 +-
 ...ickyLoginAsCustomerNotificationBannerTest.xml |  4 ++--
 27 files changed, 49 insertions(+), 49 deletions(-)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertAdminContainsMessageOrderCreatedByAdminActionGroup.xml => AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml => AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml => AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml} (90%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertAdminLoginAsCustomerConfigVisibleActionGroup.xml => AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertAdminLoginAsCustomerLogRecordActionGroup.xml => AdminAssertLoginAsCustomerLogRecordActionGroup.xml} (94%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup.xml => AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup.xml => StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml} (93%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertStorefrontCustomerOnStoreViewActionGroup.xml => StorefrontAssertCustomerOnStoreViewActionGroup.xml} (92%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertStorefrontLoginAsCustomerLoggedInActionGroup.xml => StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml} (94%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertStorefrontLoginAsCustomerNotificationBannerActionGroup.xml => StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml} (95%)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml => StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml} (96%)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminContainsMessageOrderCreatedByAdminActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
index cfab1ffc5bbf4..bcf6fc96aa131 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertAdminContainsMessageOrderCreatedByAdminActionGroup">
+    <actionGroup name="AdminAssertContainsMessageOrderCreatedByAdminActionGroup">
         <annotations>
             <description>Assert Admin Order page contains message about Order created by a Store Administrator.
             </description>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
index ec2261be6d20f..7e032b168f062 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
+    <actionGroup name="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup">
         <annotations>
             <description>Verify Login as Customer config section is not available by direct url.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
similarity index 90%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
index 18c1fb32a6f93..875869d9928a4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigNotVisibleActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigNotVisibleActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup">
+    <actionGroup name="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup">
         <annotations>
             <description>Verify no Login as Customer config section available.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigVisibleActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigVisibleActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml
index 9ddb439b2e5a3..cdc513651ad54 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerConfigVisibleActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerConfigVisibleActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertAdminLoginAsCustomerConfigVisibleActionGroup">
+    <actionGroup name="AdminAssertLoginAsCustomerConfigVisibleActionGroup">
         <annotations>
             <description>Verify Login as Customer config section available.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerLogRecordActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
similarity index 94%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerLogRecordActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
index 0c35992e025f3..da47864e28eac 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerLogRecordActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerLogRecordActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertAdminLoginAsCustomerLogRecordActionGroup">
+    <actionGroup name="AdminAssertLoginAsCustomerLogRecordActionGroup">
         <annotations>
             <description>Assert Login as Customer Log record is correct.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
index f05be04bc78fe..779cb1e5c8899 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup">
+    <actionGroup name="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup">
         <annotations>
             <description>Verify Login as Customer config section isn't available.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
similarity index 93%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
index da1be5eed010f..f40ea7f93c7a1 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup">
+    <actionGroup name="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup">
         <annotations>
             <description>Verify Storefront Order page contains message about Order created by a Store Administrator.
             </description>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontCustomerOnStoreViewActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml
similarity index 92%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontCustomerOnStoreViewActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml
index f8c240abeb8fd..f63cda2303526 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontCustomerOnStoreViewActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertCustomerOnStoreViewActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertStorefrontCustomerOnStoreViewActionGroup">
+    <actionGroup name="StorefrontAssertCustomerOnStoreViewActionGroup">
         <annotations>
             <description>Assert Customer is on the provided Store View.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerLoggedInActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
similarity index 94%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerLoggedInActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
index 7badab1fc8dfd..bb7e938bdfb59 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerLoggedInActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerLoggedInActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertStorefrontLoginAsCustomerLoggedInActionGroup">
+    <actionGroup name="StorefrontAssertLoginAsCustomerLoggedInActionGroup">
         <annotations>
             <description>Verify Admin successfully logged in as Customer.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerNotificationBannerActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml
similarity index 95%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerNotificationBannerActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml
index a2464caa54a38..ce2e261f10040 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontLoginAsCustomerNotificationBannerActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertLoginAsCustomerNotificationBannerActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup">
+    <actionGroup name="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup">
         <annotations>
             <description>Verify Login as Customer notification banner present on page.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
similarity index 96%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
index b1b3ccd05ddfc..46f582ca6d44e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup">
+    <actionGroup name="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup">
         <annotations>
             <description>Verify Sticky Login as Customer notification banner present on page.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index bdfadaf378561..42d53113e20f4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -53,7 +53,7 @@
         </actionGroup>
 
         <!-- Assert Customer logged on on default store view -->
-        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
index 7156c407ec6fa..bf2556b30967b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
@@ -84,22 +84,22 @@
         <actionGroup ref="AdminOpenLoginAsCustomerLogActionGroup" stepKey="gotoLoginAsCustomerLog"/>
 
         <!-- Perform assertions -->
-        <actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord">
+        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminFirstCustomerLogRecord">
             <argument name="rowNumber" value="4"/>
             <argument name="adminId" value="1"/>
             <argument name="customerId" value="$$createFirstCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminSecondCustomerLogRecord">
+        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyDefaultAdminSecondCustomerLogRecord">
             <argument name="rowNumber" value="3"/>
             <argument name="adminId" value="1"/>
             <argument name="customerId" value="$$createSecondCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminFirstCustomerLogRecord">
+        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminFirstCustomerLogRecord">
             <argument name="rowNumber" value="2"/>
             <argument name="adminId" value="$$createNewAdmin.id$$"/>
             <argument name="customerId" value="$$createFirstCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AssertAdminLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminSecondCustomerLogRecord">
+        <actionGroup ref="AdminAssertLoginAsCustomerLogRecordActionGroup" stepKey="verifyNewAdminSecondCustomerLogRecord">
             <argument name="rowNumber" value="1"/>
             <argument name="adminId" value="$$createNewAdmin.id$$"/>
             <argument name="customerId" value="$$createSecondCustomer.id$$"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index 5e6c48a10a894..acae07d1cda11 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -53,11 +53,11 @@
         </actionGroup>
 
         <!-- Assert Customer logged on on custom store view -->
-        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
-        <actionGroup ref="AssertStorefrontCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
+        <actionGroup ref="StorefrontAssertCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
             <argument name="storeViewName" value="{{customStore.name}}"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
index 9031644e438bd..8e5c121fed157 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerMultishippingLoggingTest.xml
@@ -82,19 +82,19 @@
         <waitForPageLoad stepKey="waitForOrderPageLoad"/>
 
         <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageFirstOrder">
+        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageFirstOrder">
             <argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
         </actionGroup>
-        <actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageSecondOrder">
+        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageSecondOrder">
             <argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
         </actionGroup>
 
         <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
+        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageFirstOrder">
             <argument name="orderId" value="{$getFirstOrderIdPlaceOrder}"/>
             <argument name="adminUserFullName" value="Magento User"/>
         </actionGroup>
-        <actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
+        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageSecondOrder">
             <argument name="orderId" value="{$getSecondOrderIdPlaceOrder}"/>
             <argument name="adminUserFullName" value="Magento User"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
index f14dfe56610dc..a4994d5c041d2 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
@@ -81,12 +81,12 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
 
         <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
+        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
             <argument name="orderId" value="{$grabOrderId}"/>
         </actionGroup>
 
         <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
+        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
             <argument name="orderId" value="{$grabOrderId}"/>
             <argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
index 98a04cd02d40a..16e0b94112562 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerReorderTest.xml
@@ -95,12 +95,12 @@
         <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabReorderId"/>
 
         <!-- Assert Storefront Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AssertStorefrontContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
+        <actionGroup ref="StorefrontAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyStorefrontMessageOrderCreatedByAdmin">
             <argument name="orderId" value="${grabReorderId}"/>
         </actionGroup>
 
         <!-- Assert Admin Order page contains message about Order created by a Store Administrator -->
-        <actionGroup ref="AssertAdminContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
+        <actionGroup ref="AdminAssertContainsMessageOrderCreatedByAdminActionGroup" stepKey="verifyAdminMessageOrderCreatedByAdmin">
             <argument name="orderId" value="${grabReorderId}"/>
             <argument name="adminUserFullName" value="{{activeAdmin.firstname}} {{activeAdmin.lastname}}"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
index 4869990ff7c42..807603bdcba0a 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSettingsAvailableForGlobalLevelTest.xml
@@ -25,16 +25,16 @@
         </after>
 
         <amOnPage url="{{AdminLoginAsCustomerConfigPage.url}}" stepKey="navigateToLoginAsCustomerConfigSection"/>
-        <actionGroup ref="AssertAdminLoginAsCustomerConfigVisibleActionGroup" stepKey="seeLoginAsCustomerConfig"/>
+        <actionGroup ref="AdminAssertLoginAsCustomerConfigVisibleActionGroup" stepKey="seeLoginAsCustomerConfig"/>
 
         <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultStoreView">
             <argument name="storeViewName" value="'Default Store View'"/>
         </actionGroup>
-        <actionGroup ref="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLinkOnStoreView"/>
+        <actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLinkOnStoreView"/>
 
         <actionGroup ref="SwitchToTheNewStoreViewActionGroup" stepKey="switchToDefaultWebsite">
             <argument name="storeViewName" value="'Main Website'"/>
         </actionGroup>
-        <actionGroup ref="AssertAdminLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLink"/>
+        <actionGroup ref="AdminAssertLoginAsCustomerSectionLinkNotAvailableActionGroup" stepKey="dontSeeLoginAsCustomerSectionLink"/>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
index 33cee2c230e31..4f484e73d580b 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
@@ -43,7 +43,7 @@
         </actionGroup>
 
         <!-- Assert correctly logged in as Customer -->
-        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
index 0172f9febf02d..e4cd48d8e868e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
@@ -46,7 +46,7 @@
         </actionGroup>
 
         <!-- Assert correctly logged in as First Customer -->
-        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromFirstCustomerPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromFirstCustomerPage">
             <argument name="customerFullName" value="$$createFirstCustomer.firstname$$ $$createFirstCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createFirstCustomer.email$$"/>
         </actionGroup>
@@ -58,7 +58,7 @@
         </actionGroup>
 
         <!-- Assert correctly logged in as Second Customer -->
-        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromSecondCustomerPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromSecondCustomerPage">
             <argument name="customerFullName" value="$$createSecondCustomer.firstname$$ $$createSecondCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createSecondCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
index 4a9a067ebd208..c7f42de741862 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerConfigurationTest.xml
@@ -87,10 +87,10 @@
         </actionGroup>
 
         <!-- Assert no Login as Customer config section visible -->
-        <actionGroup ref="AssertAdminLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>
+        <actionGroup ref="AdminAssertLoginAsCustomerConfigNotVisibleActionGroup" stepKey="assertConfigNotVisible"/>
 
         <!-- Assert Login as Customer config section is not available by direct url -->
-        <actionGroup ref="AssertAdminLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
+        <actionGroup ref="AdminAssertLoginAsCustomerConfigNotAvailableDirectlyActionGroup"
                      stepKey="assertConfigNotAvailableDirectly"/>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
index 6d5787fe605db..2bf364b29ba8d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
@@ -48,7 +48,7 @@
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
 
-        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
@@ -70,7 +70,7 @@
             <argument name="orderId" value="$grabOrderId"/>
         </actionGroup>
 
-        <actionGroup ref="AssertStorefrontLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromOrderPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
index 276a48923f764..6874fcb4fd220 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
@@ -48,20 +48,20 @@
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
         <!-- Go to Wishlist and assert notification banner -->
         <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="amOnWishListPage"/>
         <waitForPageLoad stepKey="waitForWishlistPageLoad"/>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnWishList">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnWishList">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
         <!-- Go to category page and assert notification banner -->
         <amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="navigateToCategoryPage"/>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCategoryPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCategoryPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
@@ -69,7 +69,7 @@
         <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
             <argument name="productUrlKey" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnProductPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnProductPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
@@ -79,14 +79,14 @@
             <argument name="productCount" value="1"/>
         </actionGroup>
         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCartPage"/>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCartPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCartPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
         <!-- Proceed to checkout and assert notification banner -->
         <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
         <waitForPageLoad stepKey="waitForProceedToCheckout"/>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCheckoutPage">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerOnCheckoutPage">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
@@ -95,7 +95,7 @@
         <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterClickNext"/>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerBeforePlaceOrder">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerBeforePlaceOrder">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
@@ -105,7 +105,7 @@
             <argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage"/>
             <argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage"/>
         </actionGroup>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerAfterPlaceOrder">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBannerAfterPlaceOrder">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
     </test>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
index 5a4d5ac7b3e24..d953c493562c6 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
@@ -42,7 +42,7 @@
         </actionGroup>
 
         <!-- Assert Notification Banner is present on page -->
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
index d22cb681afb30..775fcb122e181 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
@@ -77,7 +77,7 @@
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
index 96d0cec0eb20e..09ec1b427f515 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerShoppingCartIsNotMergedWithGuestCartTest.xml
@@ -57,7 +57,7 @@
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageActionGroup" stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
-        <actionGroup ref="AssertStorefrontLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
+        <actionGroup ref="StorefrontAssertLoginAsCustomerNotificationBannerActionGroup" stepKey="assertNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
index c040351b2ef76..3368fa7e5be7a 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
@@ -33,7 +33,7 @@
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
                         stepKey="disableLoginAsCustomer"/>
-            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushConfigCache">
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
                 <argument name="tags" value="config"/>
             </actionGroup>
         </after>
@@ -42,7 +42,7 @@
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
 
-        <actionGroup ref="AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup" stepKey="assertStickyNotificationBanner">
+        <actionGroup ref="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup" stepKey="assertStickyNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 

From 58b78f6d00d344563632822e9d90292cf7da31b1 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Mon, 17 Aug 2020 10:17:45 +0530
Subject: [PATCH 06/24] Feedback changes

---
 ...frontStickyLoginAsCustomerNotificationBannerActionGroup.xml} | 2 +-
 .../StorefrontStickyLoginAsCustomerNotificationBannerTest.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/{StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml => AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml} (96%)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml
similarity index 96%
rename from app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
rename to app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml
index 46f582ca6d44e..b1b3ccd05ddfc 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup">
+    <actionGroup name="AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup">
         <annotations>
             <description>Verify Sticky Login as Customer notification banner present on page.</description>
         </annotations>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
index 3368fa7e5be7a..831f8c73a668f 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
@@ -42,7 +42,7 @@
             <argument name="customerId" value="$$createCustomer.id$$"/>
         </actionGroup>
 
-        <actionGroup ref="StorefrontAssertStickyLoginAsCustomerNotificationBannerActionGroup" stepKey="assertStickyNotificationBanner">
+        <actionGroup ref="AssertStorefrontStickyLoginAsCustomerNotificationBannerActionGroup" stepKey="assertStickyNotificationBanner">
             <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
         </actionGroup>
 

From debeec23125bb76b9a65b4fb0613efddfecfc9cd Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Mon, 17 Aug 2020 19:22:15 +0530
Subject: [PATCH 07/24] Fixed MFTF test

---
 .../StorefrontStickyLoginAsCustomerNotificationBannerTest.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
index 831f8c73a668f..8d30212e183d7 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
@@ -17,6 +17,7 @@
             <description
                 value="Verify that Sticky Notification Banner is present on page if 'Login as customer' functionality used"/>
             <testCaseId value=""/>
+            <group value="login_as_customer"/>
             <severity value="CRITICAL"/>
         </annotations>
         <before>

From 32adddb365c1170b5daea7c24f8e9966e84496e9 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Wed, 19 Aug 2020 20:18:46 +0200
Subject: [PATCH 08/24] Set of improvements for LoginAsCustomer modules

---
 .../Magento/LoginAsCustomer/Model/Config.php  | 18 ++++-------
 .../Model/Config/Source/StoreViewLogin.php    |  7 -----
 .../Plugin/Button/ToolbarPlugin.php           | 30 +++++++++----------
 .../Block/Adminhtml/NotAllowedPopup.php       |  4 ---
 .../Model/Config.php                          |  3 --
 .../Plugin/CustomerDataValidatePlugin.php     | 15 +++-------
 .../Plugin/CustomerExtractorPlugin.php        | 13 ++------
 .../Plugin/InvalidateExpiredSessionPlugin.php | 20 +++++++------
 .../Config/DisablePageCacheIfNeededPlugin.php |  2 +-
 .../AdminAddCommentOnOrderPlacementPlugin.php |  5 ++--
 10 files changed, 41 insertions(+), 76 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Model/Config.php b/app/code/Magento/LoginAsCustomer/Model/Config.php
index 2cfafa6ac09a3..bec9527c65f95 100644
--- a/app/code/Magento/LoginAsCustomer/Model/Config.php
+++ b/app/code/Magento/LoginAsCustomer/Model/Config.php
@@ -10,16 +10,9 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 
-/**
- * @inheritdoc
- */
 class Config implements ConfigInterface
 {
-    /**
-     * Extension config path
-     */
-    private const XML_PATH_ENABLED
-        = 'login_as_customer/general/enabled';
+    private const XML_PATH_ENABLED = 'login_as_customer/general/enabled';
     private const XML_PATH_STORE_VIEW_MANUAL_CHOICE_ENABLED
         = 'login_as_customer/general/store_view_manual_choice_enabled';
     private const XML_PATH_AUTHENTICATION_EXPIRATION_TIME
@@ -33,9 +26,8 @@ class Config implements ConfigInterface
     /**
      * @param ScopeConfigInterface $scopeConfig
      */
-    public function __construct(
-        ScopeConfigInterface $scopeConfig
-    ) {
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
         $this->scopeConfig = $scopeConfig;
     }
 
@@ -44,7 +36,7 @@ public function __construct(
      */
     public function isEnabled(): bool
     {
-        return (bool)$this->scopeConfig->getValue(self::XML_PATH_ENABLED);
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED);
     }
 
     /**
@@ -52,7 +44,7 @@ public function isEnabled(): bool
      */
     public function isStoreManualChoiceEnabled(): bool
     {
-        return (bool)$this->scopeConfig->getValue(self::XML_PATH_STORE_VIEW_MANUAL_CHOICE_ENABLED);
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_STORE_VIEW_MANUAL_CHOICE_ENABLED);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Model/Config/Source/StoreViewLogin.php b/app/code/Magento/LoginAsCustomerAdminUi/Model/Config/Source/StoreViewLogin.php
index 265c4fedb722d..9d14a4b44d10b 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Model/Config/Source/StoreViewLogin.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Model/Config/Source/StoreViewLogin.php
@@ -12,14 +12,7 @@
  */
 class StoreViewLogin implements \Magento\Framework\Data\OptionSourceInterface
 {
-    /**
-     * @const int
-     */
     private const AUTODETECT = 0;
-
-    /**
-     * @const int
-     */
     private const MANUAL = 1;
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php b/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
index c67b0d9dd5273..2cdcd5723df4b 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Plugin/Button/ToolbarPlugin.php
@@ -8,6 +8,7 @@
 namespace Magento\LoginAsCustomerAdminUi\Plugin\Button;
 
 use Magento\Backend\Block\Widget\Button\ButtonList;
+use Magento\Backend\Block\Widget\Button\ToolbarInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\AbstractBlock;
@@ -61,13 +62,13 @@ public function __construct(
     /**
      * Add Login as Customer button.
      *
-     * @param \Magento\Backend\Block\Widget\Button\ToolbarInterface $subject
-     * @param \Magento\Framework\View\Element\AbstractBlock $context
-     * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
+     * @param ToolbarInterface $subject
+     * @param AbstractBlock $context
+     * @param ButtonList $buttonList
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforePushButtons(
-        \Magento\Backend\Block\Widget\Button\ToolbarInterface $subject,
+        ToolbarInterface $subject,
         AbstractBlock $context,
         ButtonList $buttonList
     ): void {
@@ -97,18 +98,17 @@ public function beforePushButtons(
      */
     private function getOrder(string $nameInLayout, AbstractBlock $context)
     {
-        $order = null;
-
-        if ('sales_order_edit' == $nameInLayout) {
-            $order = $context->getOrder();
-        } elseif ('sales_invoice_view' == $nameInLayout) {
-            $order = $context->getInvoice()->getOrder();
-        } elseif ('sales_shipment_view' == $nameInLayout) {
-            $order = $context->getShipment()->getOrder();
-        } elseif ('sales_creditmemo_view' == $nameInLayout) {
-            $order = $context->getCreditmemo()->getOrder();
+        switch ($nameInLayout) {
+            case 'sales_order_edit':
+                return $context->getOrder();
+            case 'sales_invoice_view':
+                return $context->getInvoice()->getOrder();
+            case 'sales_shipment_view':
+                return $context->getShipment()->getOrder();
+            case 'sales_creditmemo_view':
+                return $context->getCreditmemo()->getOrder();
         }
 
-        return $order;
+        return null;
     }
 }
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
index 547be1de5a008..b98ea203057b1 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
@@ -19,15 +19,11 @@
 class NotAllowedPopup extends Template
 {
     /**
-     * Config
-     *
      * @var ConfigInterface
      */
     private $config;
 
     /**
-     * Json Serializer
-     *
      * @var Json
      */
     private $json;
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
index 2fce39cd4e85e..c2244fa3a799c 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
@@ -16,9 +16,6 @@
  */
 class Config implements ConfigInterface
 {
-    /**
-     * Extension config path
-     */
     private const XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE
         = 'login_as_customer/general/shopping_assistance_checkbox_title';
     private const XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
index 9da329b4a3991..7512936db6ad9 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -11,6 +11,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Message\MessageInterface;
+use Magento\Framework\Validator\Exception;
 use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
 
@@ -46,16 +47,12 @@ public function __construct(
      *
      * @param Form $subject
      * @param RequestInterface $request
-     * @param null|string $scope
-     * @param bool $scopeOnly
-     * @throws \Magento\Framework\Validator\Exception
+     * @throws Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeExtractData(
         Form $subject,
-        RequestInterface $request,
-        $scope = null,
-        $scopeOnly = true
+        RequestInterface $request
     ): void {
         if ($this->isSetAssistanceAllowedParam($request)
             && !$this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance')
@@ -74,11 +71,7 @@ public function beforeExtractData(
                     ],
                 ];
 
-                throw new \Magento\Framework\Validator\Exception(
-                    null,
-                    null,
-                    $errorMessages
-                );
+                throw new Exception(null, null, $errorMessages);
             }
         }
     }
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php
index 619036da8bb22..156d84bcae9bd 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php
@@ -35,27 +35,20 @@ public function __construct(
      * Add assistance_allowed extension attribute value to Customer instance.
      *
      * @param CustomerExtractor $subject
-     * @param callable $proceed
+     * @param CustomerInterface $customer
      * @param string $formCode
      * @param RequestInterface $request
      * @param array $attributeValues
      * @return CustomerInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundExtract(
+    public function afterExtract(
         CustomerExtractor $subject,
-        callable $proceed,
+        CustomerInterface $customer,
         string $formCode,
         RequestInterface $request,
         array $attributeValues = []
     ) {
-        /** @var CustomerInterface $customer */
-        $customer = $proceed(
-            $formCode,
-            $request,
-            $attributeValues
-        );
-
         $assistanceAllowedStatus = $request->getParam('assistance_allowed');
         if (!empty($assistanceAllowedStatus)) {
             $extensionAttributes = $customer->getExtensionAttributes();
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
index c1e035ac9637c..7c0682440b4dc 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/Plugin/InvalidateExpiredSessionPlugin.php
@@ -65,15 +65,17 @@ public function __construct(
      */
     public function beforeExecute(ActionInterface $subject)
     {
-        if ($this->config->isEnabled()) {
-            $adminId = $this->getLoggedAsCustomerAdminId->execute();
-            $customerId = (int)$this->session->getCustomerId();
-            if ($adminId && $customerId) {
-                if (!$this->isLoginAsCustomerSessionActive->execute($customerId, $adminId)) {
-                    $this->session->clearStorage();
-                    $this->session->expireSessionCookie();
-                    $this->session->regenerateId();
-                }
+        if (!$this->config->isEnabled()) {
+            return;
+        }
+
+        $adminId = $this->getLoggedAsCustomerAdminId->execute();
+        $customerId = (int)$this->session->getCustomerId();
+        if ($adminId && $customerId) {
+            if (!$this->isLoginAsCustomerSessionActive->execute($customerId, $adminId)) {
+                $this->session->clearStorage();
+                $this->session->expireSessionCookie();
+                $this->session->regenerateId();
             }
         }
     }
diff --git a/app/code/Magento/LoginAsCustomerPageCache/Plugin/PageCache/Model/Config/DisablePageCacheIfNeededPlugin.php b/app/code/Magento/LoginAsCustomerPageCache/Plugin/PageCache/Model/Config/DisablePageCacheIfNeededPlugin.php
index dabf8c62e1dee..2b98c1f6c119e 100644
--- a/app/code/Magento/LoginAsCustomerPageCache/Plugin/PageCache/Model/Config/DisablePageCacheIfNeededPlugin.php
+++ b/app/code/Magento/LoginAsCustomerPageCache/Plugin/PageCache/Model/Config/DisablePageCacheIfNeededPlugin.php
@@ -54,7 +54,7 @@ public function __construct(
     public function afterIsEnabled(Config $subject, $isEnabled): bool
     {
         if ($isEnabled) {
-            $disable = $this->scopeConfig->getValue(
+            $disable = $this->scopeConfig->isSetFlag(
                 'login_as_customer/general/disable_page_cache',
                 ScopeInterface::SCOPE_STORE
             );
diff --git a/app/code/Magento/LoginAsCustomerSales/Plugin/AdminAddCommentOnOrderPlacementPlugin.php b/app/code/Magento/LoginAsCustomerSales/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
index 2ae982e536f49..3a27a5ef9e561 100644
--- a/app/code/Magento/LoginAsCustomerSales/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
+++ b/app/code/Magento/LoginAsCustomerSales/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
@@ -25,9 +25,8 @@ class AdminAddCommentOnOrderPlacementPlugin
     /**
      * @param Session $session
      */
-    public function __construct(
-        Session $session
-    ) {
+    public function __construct(Session $session)
+    {
         $this->userSession = $session;
     }
 

From 2aca78a139b29368f34f4c8d64c51763178856c8 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 20 Aug 2020 10:37:52 +0530
Subject: [PATCH 09/24] Added reverted review changes

---
 .../StorefrontStickyLoginAsCustomerNotificationBannerTest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
index 8d30212e183d7..f9dc3863769df 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
@@ -23,7 +23,7 @@
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
                         stepKey="enableLoginAsCustomer"/>
-            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanConfigCache">
                 <argument name="tags" value="config"/>
             </actionGroup>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
@@ -34,7 +34,7 @@
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
                         stepKey="disableLoginAsCustomer"/>
-            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushConfigCache">
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanConfigCache">
                 <argument name="tags" value="config"/>
             </actionGroup>
         </after>

From eca27c78db1621eac2ec16553f66d4519a00d56b Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Thu, 20 Aug 2020 13:37:09 +0530
Subject: [PATCH 10/24] Fixed MFTF test

---
 .../StorefrontStickyLoginAsCustomerNotificationBannerTest.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
index f9dc3863769df..611bc1044fd00 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontStickyLoginAsCustomerNotificationBannerTest.xml
@@ -26,7 +26,7 @@
             <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanConfigCache">
                 <argument name="tags" value="config"/>
             </actionGroup>
-            <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
 

From b4d78e7435a65e299fd8230030701c3fc082b146 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Thu, 20 Aug 2020 10:31:08 +0200
Subject: [PATCH 11/24] Fix Static tests failure

---
 .../Plugin/CustomerDataValidatePlugin.php                   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
index 7512936db6ad9..ed2f599c16c63 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -47,12 +47,16 @@ public function __construct(
      *
      * @param Form $subject
      * @param RequestInterface $request
+     * @param null|string $scope
+     * @param bool $scopeOnly
      * @throws Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeExtractData(
         Form $subject,
-        RequestInterface $request
+        RequestInterface $request,
+        $scope = null,
+        $scopeOnly = true
     ): void {
         if ($this->isSetAssistanceAllowedParam($request)
             && !$this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance')

From b68e049804bb77e51695aeae2307b7dbf16eb553 Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Thu, 20 Aug 2020 12:43:49 +0200
Subject: [PATCH 12/24] Fix Static tests failure

---
 .../Plugin/CustomerDataValidatePlugin.php                        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
index ed2f599c16c63..c11326c95bf0e 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -75,6 +75,7 @@ public function beforeExtractData(
                     ],
                 ];
 
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new Exception(null, null, $errorMessages);
             }
         }

From 2ba01638f1ad0a347f8d2f359c868fc7eb661e9f Mon Sep 17 00:00:00 2001
From: Lukasz Bajsarowicz <lukasz.bajsarowicz@gmail.com>
Date: Thu, 20 Aug 2020 12:45:07 +0200
Subject: [PATCH 13/24] Better way to fix the false positive

---
 .../Plugin/CustomerDataValidatePlugin.php                  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
index c11326c95bf0e..4bbf691e2b58e 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\AuthorizationInterface;
 use Magento\Framework\Message\MessageInterface;
-use Magento\Framework\Validator\Exception;
+use Magento\Framework\Validator\Exception as ValidatorException;
 use Magento\LoginAsCustomerAssistance\Api\IsAssistanceEnabledInterface;
 use Magento\LoginAsCustomerAssistance\Model\ResourceModel\GetLoginAsCustomerAssistanceAllowed;
 
@@ -49,7 +49,7 @@ public function __construct(
      * @param RequestInterface $request
      * @param null|string $scope
      * @param bool $scopeOnly
-     * @throws Exception
+     * @throws ValidatorException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeExtractData(
@@ -75,8 +75,7 @@ public function beforeExtractData(
                     ],
                 ];
 
-                // phpcs:ignore Magento2.Exceptions.DirectThrow
-                throw new Exception(null, null, $errorMessages);
+                throw new ValidatorException(null, null, $errorMessages);
             }
         }
     }

From 80c1f3ca7e0abffbf214c14292cd6fe322f0b484 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 4 Sep 2020 22:25:01 +0800
Subject: [PATCH 14/24] magento/adobe-stock-integration#1795: [MFTF] Unskip
 AdminMediaGalleryCatalogUiUsedInProductFilterTest - modified test and
 actiongroup

---
 ...dminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml | 2 +-
 .../AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml     | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
index e21fa89965391..fbf4437b8266d 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
@@ -15,6 +15,6 @@
             <argument name="filterPlaceholder" type="string"/>
         </arguments>
 
-        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeFilter"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="SKU: {{filterPlaceholder}}" stepKey="seeFilter"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index d2a04a7d21d11..11b64c596fb84 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -9,9 +9,6 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminMediaGalleryCatalogUiUsedInProductFilterTest">
         <annotations>
-            <skip>
-                <issueId value="https://github.com/magento/adobe-stock-integration/issues/1795"/>
-            </skip>
             <features value="AdminMediaGalleryUsedInProductsFilter"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
             <title value="User can open product entity the asset is associated"/>
@@ -65,6 +62,7 @@
 
         <deleteData createDataKey="product" stepKey="deleteProduct"/>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToAssertEmptyUsedIn"/>
         <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>

From 055ad7e58e21ff7748493892c43eb980cddc3984 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 4 Sep 2020 23:50:04 +0800
Subject: [PATCH 15/24] magento/adobe-stock-integration#1795: [MFTF] Unskip
 AdminMediaGalleryCatalogUiUsedInProductFilterTest - modified actiongroup

---
 .../AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
index fbf4437b8266d..e21fa89965391 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
@@ -15,6 +15,6 @@
             <argument name="filterPlaceholder" type="string"/>
         </arguments>
 
-        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="SKU: {{filterPlaceholder}}" stepKey="seeFilter"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeFilter"/>
     </actionGroup>
 </actionGroups>

From a298f3b7123ff5fce15822aa7b3d8c9186dec584 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Sat, 5 Sep 2020 02:35:29 +0800
Subject: [PATCH 16/24] magento/adobe-stock-integration#1795: [MFTF] Unskip
 AdminMediaGalleryCatalogUiUsedInProductFilterTest - modified test file

---
 .../AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index 11b64c596fb84..3caa106ffa245 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -43,6 +43,8 @@
         <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
         <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductsGrid"/>
+        <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
@@ -57,7 +59,7 @@
         </actionGroup>
 
         <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
-            <argument name="filterPlaceholder" value="$$product.name$$"/>
+            <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
         </actionGroup>
 
         <deleteData createDataKey="product" stepKey="deleteProduct"/>
@@ -71,7 +73,7 @@
         <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
             <argument name="imageName" value="{{ImageMetadata.title}}"/>
         </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
         <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
 
    </test>

From c1410e7da82dad289b5efe172c9c0f5f67a13dd7 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Tue, 8 Sep 2020 00:28:52 +0800
Subject: [PATCH 17/24] magento/adobe-stock-integration#1795: [MFTF] Unskip
 AdminMediaGalleryCatalogUiUsedInProductFilterTest - modified sorting mftf
 tests

---
 ...diaGallerySortByDirectoryAscendingTest.xml | 47 +++++-------------
 ...iaGallerySortByDirectoryDescendingTest.xml | 48 +++++--------------
 .../AdminMediaGallerySortByNameAToZTest.xml   | 47 +++++-------------
 .../AdminMediaGallerySortByNameZToATest.xml   | 47 +++++-------------
 ...AdminMediaGallerySortByNewestFirstTest.xml | 46 +++++-------------
 ...AdminMediaGallerySortByOldestFirstTest.xml | 46 +++++-------------
 6 files changed, 78 insertions(+), 203 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml
index 4dbf3da0752b2..365252095d49e 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryAscendingTest.xml
@@ -24,58 +24,37 @@
         <after>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
-                <argument name="name" value="firstFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
-                <argument name="name" value="firstFolder"/>
-            </actionGroup>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
-                <argument name="name" value="secondFolder"/>
-            </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
-                <argument name="name" value="secondFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
         </after>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-
+        <waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
             <argument name="image" value="ImageUpload_1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="waitForGridToLoad"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
             <argument name="image" value="ImageUpload1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
-
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByDirectoryAscending">
             <argument name="sortName" value="directory_asc"/>
         </actionGroup>
-
         <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByDirectoryAscending">
             <argument name="firstImageFile" value="{{ImageUpload_1.file}}"/>
             <argument name="secondImageFile" value="{{ImageUpload.file}}"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml
index 025da24511b73..85c468996d515 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByDirectoryDescendingTest.xml
@@ -21,62 +21,40 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
-
         <after>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
-                <argument name="name" value="firstFolder"/>
-            </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
-                <argument name="name" value="firstFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
-                <argument name="name" value="secondFolder"/>
-            </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
-                <argument name="name" value="secondFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
         </after>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-
+        <waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
             <argument name="image" value="ImageUpload_1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="waitForGridToLoad"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
             <argument name="image" value="ImageUpload1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
-
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByDirectoryDescending">
             <argument name="sortName" value="directory_desc"/>
         </actionGroup>
-
         <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByDirectoryDescending">
             <argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
             <argument name="secondImageFile" value="{{ImageUpload.file}}"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
index da0d8a18b75e4..9dca51065124f 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameAToZTest.xml
@@ -24,58 +24,37 @@
         <after>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
-                <argument name="name" value="firstFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
-                <argument name="name" value="firstFolder"/>
-            </actionGroup>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
-                <argument name="name" value="secondFolder"/>
-            </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
-                <argument name="name" value="secondFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
         </after>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-
+        <waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
             <argument name="image" value="ImageUpload_1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="waitForGridToLoad"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
             <argument name="image" value="ImageUpload1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
-
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameAToZ">
             <argument name="sortName" value="name_az"/>
         </actionGroup>
-
         <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameAToZ">
             <argument name="firstImageFile" value="{{ImageUpload.file}}"/>
             <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
index 4b5086e5d63ff..71d2020d08658 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNameZToATest.xml
@@ -24,58 +24,37 @@
         <after>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
-                <argument name="name" value="firstFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
-                <argument name="name" value="firstFolder"/>
-            </actionGroup>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
-                <argument name="name" value="secondFolder"/>
-            </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
-                <argument name="name" value="secondFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
         </after>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-
+        <waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
             <argument name="image" value="ImageUpload_1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="waitForGridToLoad"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
             <argument name="image" value="ImageUpload1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
-
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNameZToA">
             <argument name="sortName" value="name_za"/>
         </actionGroup>
-
         <actionGroup ref="AssertAdminEnhancedMediaGallerySortByActionGroup" stepKey="assertImagePositionAfterSortByNameZToA">
             <argument name="firstImageFile" value="{{ImageUpload1.value}}"/>
             <argument name="secondImageFile" value="{{ImageUpload_1.file}}"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNewestFirstTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNewestFirstTest.xml
index 4274b26d5770f..3da0546db090a 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNewestFirstTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByNewestFirstTest.xml
@@ -21,57 +21,37 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
-
         <after>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
-                <argument name="name" value="firstFolder"/>
-            </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
-                <argument name="name" value="firstFolder"/>
-            </actionGroup>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
-                <argument name="name" value="secondFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
-                <argument name="name" value="secondFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
         </after>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-
+        <waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
             <argument name="image" value="ImageUpload_1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="waitForGridToLoad"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
             <argument name="image" value="ImageUpload1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByNewestFirst">
             <argument name="sortName" value="newest_first"/>
         </actionGroup>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByOldestFirstTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByOldestFirstTest.xml
index e67fdcfcf40b3..e6191d2d02287 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByOldestFirstTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySortByOldestFirstTest.xml
@@ -24,54 +24,34 @@
         <after>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFirstFolderForDelete">
-                <argument name="name" value="firstFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectParentFolderForDelete">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFirstFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFirstFolderWasDeleted">
-                <argument name="name" value="firstFolder"/>
-            </actionGroup>
-            <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
-            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectSecondFolderForDelete">
-                <argument name="name" value="secondFolder"/>
-            </actionGroup>
-            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteSecondFolder"/>
-            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertSecondFolderWasDeleted">
-                <argument name="name" value="secondFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteParentFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertParentFolderWasDeleted">
+                <argument name="name" value="parentFolder"/>
             </actionGroup>
         </after>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryPage"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openFirstNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createFirstNewFolder">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openParentFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createParentFolder">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertFirstNewFolderCreated">
-            <argument name="name" value="firstFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertParentFolderCreated">
+            <argument name="name" value="parentFolder"/>
         </actionGroup>
-
+        <waitForPageLoad stepKey="waitForGridToLoadAfterParentFolderCreated"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
             <argument name="image" value="ImageUpload_1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="waitForGridToLoad"/>
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openSecondNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createSecondNewFolder">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertSecondNewFolderCreated">
-            <argument name="name" value="secondFolder"/>
-        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadThirdImage">
             <argument name="image" value="ImageUpload1"/>
         </actionGroup>
-
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="secondResetAdminDataGridToDefaultView"/>
-        <waitForPageLoad stepKey="secondWaitForGridToLoad"/>
-
+        <waitForPageLoad stepKey="waitForGridToLoad"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickSortActionGroup" stepKey="sortByOldestFirst">
             <argument name="sortName" value="oldest_first"/>
         </actionGroup>

From f8fd731bc3a56a59a89ffc967456d162275476aa Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Wed, 9 Sep 2020 14:01:01 +0300
Subject: [PATCH 18/24] adobe-stock-integration#1813: fix saving default
 directory in the default bookmark of media gallery

---
 .../view/adminhtml/web/js/directory/directoryTree.js   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index 2e1e9a980cd59..b53896e599b8d 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -18,12 +18,14 @@ define([
     return Component.extend({
         defaults: {
             filterChipsProvider: 'componentType = filters, ns = ${ $.ns }',
+            bookmarkProvider: 'componentType = bookmark, ns = ${ $.ns }',
             directoryTreeSelector: '#media-gallery-directory-tree',
             getDirectoryTreeUrl: 'media_gallery/directories/gettree',
             createDirectoryUrl: 'media_gallery/directories/create',
             deleteDirectoryUrl: 'media_gallery/directories/delete',
             jsTreeReloaded: null,
             modules: {
+                bookmarks: '${ $.bookmarkProvider }',
                 directories: '${ $.name }_directories',
                 filterChips: '${ $.filterChipsProvider }'
             },
@@ -256,7 +258,15 @@ define([
 
                 return;
             }
+            if (!_.isUndefined(this.bookmarks())) {
+                if (!_.size(this.bookmarks().getViewData(this.bookmarks().defaultIndex))) {
+                    setTimeout(function () {
+                        this.updateSelectedDirectory();
+                    }.bind(this), 500);
 
+                    return;
+                }
+            }
             currentTreePath = this.isFilterApplied(currentFilterPath) || _.isNull(requestedDirectory) ?
                 currentFilterPath : requestedDirectory;
 

From 235318a1d715e32ff1d685a9f36c612501e77c9a Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Wed, 9 Sep 2020 17:01:01 +0300
Subject: [PATCH 19/24] adobe-stock-integration#1813: mftf test

---
 ...iaGalleryDefaultViewWithoutFiltersTest.xml | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml
new file mode 100644
index 0000000000000..a8df997528ad3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml
@@ -0,0 +1,43 @@
+<?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="AdminMediaGalleryDefaultViewWithoutFiltersTest">
+        <annotations>
+            <features value="AdminMediaGalleryDefaultViewWithoutFiltersTest"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1813"/>
+            <title value="User shouldn't see applied filters if media gallery switched to Default View"/>
+            <description value="No filters should be applied if Default View selected"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Open category page -->
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem">
+            <argument name="categoryName" value="$category.name$"/>
+        </actionGroup>
+
+        <!-- Open media gallery folder -->
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="selectDefaultView">
+            <argument name="selectView" value="Default View"/>
+        </actionGroup>
+
+        <!-- Asset folder is empty -->
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertNoActiveFiltersAppliedActionGroup" stepKey="assertEmptyFolder"/>
+    </test>
+</tests>

From e786fb14f08545a43b2156a9e08a852e0b366376 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 11 Sep 2020 00:47:07 +0800
Subject: [PATCH 20/24] magento/adobe-stock-integration#1795: [MFTF] Unskip
 AdminMediaGalleryCatalogUiUsedInProductFilterTest - applied requested changes

---
 .../Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index 3caa106ffa245..a66009e9d2045 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -61,6 +61,7 @@
         <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
             <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
         </actionGroup>
+        <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFiltersOnProductGrid"/>
 
         <deleteData createDataKey="product" stepKey="deleteProduct"/>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>

From 2956a4816591ee3e3cc5de681ce0f49f5b3ff44f Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Date: Fri, 11 Sep 2020 09:51:03 +0300
Subject: [PATCH 21/24] Update minimum required php version in bootstrap.php

---
 app/bootstrap.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/bootstrap.php b/app/bootstrap.php
index 4974acdf0fc80..4c96d084f4bb6 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -14,15 +14,15 @@
 #ini_set('display_errors', 1);
 
 /* PHP version validation */
-if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70103) {
+if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70300) {
     if (PHP_SAPI == 'cli') {
-        echo 'Magento supports PHP 7.1.3 or later. ' .
-            'Please read https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html';
+        echo 'Magento supports PHP 7.3.0 or later. ' .
+            'Please read https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
-    <p>Magento supports PHP 7.1.3 or later. Please read
-    <a target="_blank" href="https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html">
+    <p>Magento supports PHP 7.3.0 or later. Please read
+    <a target="_blank" href="https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements-tech.html">
     Magento System Requirements</a>.
 </div>
 HTML;

From b1ed802014177c6bb1b5d49ecb398fa71ccee1d2 Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Fri, 11 Sep 2020 15:06:36 +0300
Subject: [PATCH 22/24] adobe-stock-integration#1813: fix static, add
 testcaseId

---
 .../Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml | 1 +
 .../view/adminhtml/web/js/directory/directoryTree.js             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml
index a8df997528ad3..a41a27cdd715d 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml
@@ -13,6 +13,7 @@
             <features value="AdminMediaGalleryDefaultViewWithoutFiltersTest"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1813"/>
             <title value="User shouldn't see applied filters if media gallery switched to Default View"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/5199870"/>
             <description value="No filters should be applied if Default View selected"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index b53896e599b8d..b1224c33d3561 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -258,6 +258,7 @@ define([
 
                 return;
             }
+
             if (!_.isUndefined(this.bookmarks())) {
                 if (!_.size(this.bookmarks().getViewData(this.bookmarks().defaultIndex))) {
                     setTimeout(function () {

From be49be365affd0c4d29f42f99335669bd943a8a3 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 11 Sep 2020 14:22:39 +0100
Subject: [PATCH 23/24] magento/magento2#29959: Added stories tag to
 AdminMediaGalleryDefaultViewWithoutFiltersTest

---
 .../Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml
index a41a27cdd715d..7c2087247c574 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDefaultViewWithoutFiltersTest.xml
@@ -13,6 +13,7 @@
             <features value="AdminMediaGalleryDefaultViewWithoutFiltersTest"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1813"/>
             <title value="User shouldn't see applied filters if media gallery switched to Default View"/>
+            <stories value="Media gallery default directory"/>
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/5199870"/>
             <description value="No filters should be applied if Default View selected"/>
             <severity value="CRITICAL"/>

From 7b2d58b11c7ce09f3b9bee538f35ff78f7653f4c Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 11 Sep 2020 23:36:04 +0800
Subject: [PATCH 24/24] magento/adobe-stock-integration#1829: Duplicated items
 in Asset filter on Entities grids - added filter rate limit and method
 configuration to ui component

---
 .../view/adminhtml/ui_component/cms_block_listing.xml           | 2 ++
 .../view/adminhtml/ui_component/cms_page_listing.xml            | 2 ++
 .../view/adminhtml/ui_component/product_listing.xml             | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml
index 20988fad5ff35..974171617a19b 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml
@@ -21,6 +21,8 @@
                         <item name="identityColumn" xsi:type="string">block_id</item>
                         <item name="filterPlaceholder" xsi:type="string" translate="true">Asset Title</item>
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find assets</item>
+                        <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
+                        <item name="filterRateLimitMethod" xsi:type="string" translate="true">notifyWhenChangesStop</item>
                         <item name="searchOptions" xsi:type="boolean">true</item>
                         <item name="filterOptions" xsi:type="boolean">true</item>
                         <item name="searchUrl" xsi:type="url" path="media_gallery/asset/search" />
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml
index 4abeb71679bde..4e59b485df503 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml
@@ -23,6 +23,8 @@
                         <item name="searchOptions" xsi:type="boolean">true</item>
                         <item name="filterPlaceholder" xsi:type="string" translate="true">Asset Title</item>
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find assets</item>
+                        <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
+                        <item name="filterRateLimitMethod" xsi:type="string" translate="true">notifyWhenChangesStop</item>
                         <item name="searchUrl" xsi:type="url" path="media_gallery/asset/search" />
                         <item name="validationUrl" xsi:type="url" path="media_gallery/asset/getSelected"/>
                         <item name="levelsVisibility" xsi:type="number">1</item>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml
index 4634652e9cc19..0710479ec0f61 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml
@@ -23,6 +23,8 @@
                         <item name="searchOptions" xsi:type="boolean">true</item>
                         <item name="filterPlaceholder" xsi:type="string" translate="true">Asset Title</item>
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find assets</item>
+                        <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
+                        <item name="filterRateLimitMethod" xsi:type="string" translate="true">notifyWhenChangesStop</item>
                         <item name="searchUrl" xsi:type="url" path="media_gallery/asset/search" />
                         <item name="validationUrl" xsi:type="url" path="media_gallery/asset/getSelected"/>
                         <item name="levelsVisibility" xsi:type="number">1</item>