From f3663f05d08539f6b42bcc708fab50c924765e83 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Wed, 14 Oct 2020 11:31:08 -0500
Subject: [PATCH 01/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

- Fixing MFTF annotations for Company module
- Fixing AdminCheckThatReorderIsNotAvailableForTeamTest
---
 ...LinkFromCheckoutSuccessPageActionGroup.xml | 19 +++++++++++++++++++
 .../StorefrontCustomerOrderSection.xml        |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml
new file mode 100644
index 0000000000000..ddff0153f93be
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup">
+        <annotations>
+            <description>Clicks the order number link from the checkout success page</description>
+        </annotations>
+        <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForText selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="Order # " stepKey="waitForPageTitle"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
index 61ce050aa3ef2..00703d8cc5235 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderSection.xml
@@ -15,6 +15,8 @@
         <element name="productCustomOptionsLink" type="text" selector="//strong[contains(@class, 'product-item-name') and normalize-space(.)='{{var1}}']/following-sibling::*[contains(@class, 'item-options')]/dt[normalize-space(.)='{{var2}}']/following-sibling::dd//a[text() = '{{var3}}']" parameterized="true"/>
         <element name="status" type="text" selector="//td[contains(concat(' ',normalize-space(@class),' '),' col status ')]"/>
         <element name="viewOrder" type="button" selector="//td[contains(concat(' ',normalize-space(@class),' '),' col actions ')]/a[contains(concat(' ',normalize-space(@class),' '),' action view ')]"/>
+        <element name="viewOrderByOrderNumber" type="button" parameterized="true" selector="//td[.='{{orderNumber}}']/ancestor::tr//a[contains(concat(' ',normalize-space(@class),' '),' action view ')]"/>
+        <element name="reorderByOrderNumber" type="button" parameterized="true" selector="//td[.='{{orderNumber}}']/ancestor::tr//a[contains(concat(' ',normalize-space(@class),' '),' action order ')]"/>
         <element name="tabRefund" type="button" selector="//a[text()='Refunds']"/>
         <element name="grandTotalRefund" type="text" selector="td[data-th='Grand Total'] > strong > span.price"/>
         <element name="currentPage" type="text" selector=".order-products-toolbar .pages .current span:nth-of-type(2)"/>

From d8a14596bb52ebacb5cca4a357401bb37ef24a1d Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Tue, 27 Oct 2020 08:56:51 -0500
Subject: [PATCH 02/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Fixing MFTF annotations for Company module
 - Cleaning up AdminReplaceCompanyAdminTest
 - Cleaning up AdminSetActiveCustomerGridWorkCorrectTest
---
 ...rontGoToCustomerAddressesPageActionGroup.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerAddressesPageActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerAddressesPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerAddressesPageActionGroup.xml
new file mode 100644
index 0000000000000..33287b87346e5
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerAddressesPageActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="StorefrontGoToCustomerAddressesPageActionGroup">
+        <annotations>
+            <description>Goes to the storefront customer addresses page</description>
+        </annotations>
+        <amOnPage url="{{StorefrontCustomerAddressesPage.url}}" stepKey="goToAddressPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>

From 761a48b415c357e32a8eeaf90886bea0aa063c93 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Thu, 12 Nov 2020 08:25:07 -0600
Subject: [PATCH 03/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Updating AdminSetActiveCustomerGridWorkCorrectTest
---
 ...minSetCustomerActiveViaGridActionGroup.xml | 26 +++++++++++++++++++
 ...nSetCustomerInactiveViaGridActionGroup.xml | 18 +++++++++++++
 .../AdminCustomerGridMainActionsSection.xml   |  2 ++
 .../Mftf/Section/AdminCustomerGridSection.xml |  1 +
 4 files changed, 47 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml
new file mode 100644
index 0000000000000..7dff20dcb657b
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml
@@ -0,0 +1,26 @@
+<?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="AdminSetCustomerActiveViaGridActionGroup">
+        <annotations>
+            <description>Sets a Customer to the Active status from the admin All Customers grid</description>
+        </annotations>
+        <arguments>
+            <argument name="customerEmail" type="string" defaultValue="{{Simple_US_CA_Customer.email}}"/>
+        </arguments>
+        <waitForElementVisible selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}" stepKey="waitForCustomerRow"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}" stepKey="selectCustomer"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.actions}}" stepKey="clickActions"/>
+        <waitForElementVisible selector="{{AdminCustomerGridMainActionsSection.setActive}}" stepKey="waitForDropDownOpen"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.setActive}}" stepKey="clickSetActive"/>
+        <waitForPageLoad stepKey="waitForLoad"/>
+        <waitForText selector="{{AdminMessagesSection.success}}" userInput="A total of 1 record(s) were updated." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml
new file mode 100644
index 0000000000000..94151d72dffcb
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSetCustomerInactiveViaGridActionGroup" extends="AdminSetCustomerActiveViaGridActionGroup">
+        <annotations>
+            <description>Sets a Customer to the Inactive status from the admin All Customers grid</description>
+        </annotations>
+        <waitForElementVisible selector="{{AdminCustomerGridMainActionsSection.setInactive}}" stepKey="waitForDropDownOpen"/>
+        <click selector="{{AdminCustomerGridMainActionsSection.setInactive}}" stepKey="clickSetActive"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
index 44ab653259b55..a2d77a093db3d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
@@ -17,5 +17,7 @@
         <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
         <element name="addNewAddress" type="button" selector=".add-new-address-button" timeout="30"/>
         <element name="actions" type="text" selector=".admin__data-grid-header-row .action-select"/>
+        <element name="setActive" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Set Active']" timeout="30"/>
+        <element name="setInactive" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Set Inactive']" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
index 9562a902b26da..a713a606426c8 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridSection.xml
@@ -17,6 +17,7 @@
         <element name="customerEditLinkByEmail" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//a[@class='action-menu-item']" parameterized="true" timeout="30"/>
         <element name="customerGroupByEmail" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//div[text()='{{customerGroup}}']" parameterized="true"/>
         <element name="customerGenderByEmail" type="text" selector="//tr[@class='data-row']//div[text()='{{customerEmail}}']/ancestor::tr/td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Gender')]/preceding-sibling::th) +1]" parameterized="true"/>
+        <element name="status" type="text" selector="//tr[@class='data-row' and //div[text()='{{customerEmail}}']]//div[contains(text(), '{{status}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
 

From 6aaac9e098f5e9936b70d6ddf530519cfd4c00ed Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Mon, 16 Nov 2020 13:56:12 -0600
Subject: [PATCH 04/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Cleaning up StorefrontNonCompanyCustomerCreatesCompanyTest
 - Cleaning up StorefrontCompanyUserCreateTest
 - Cleaning up AdminVerifyCustomerGroupOfACustomerChangesWhenACompanyIsAssignedToTheCustomerTest
 - Cleaning up AdminVerifyCustomerGroupOfCompanyCustomerChangesWhenNewCustomerGroupIsAssignedToACompanyTest
---
 ...tionTabFromCustomerEditPageActionGroup.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenAccountInformationTabFromCustomerEditPageActionGroup.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenAccountInformationTabFromCustomerEditPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenAccountInformationTabFromCustomerEditPageActionGroup.xml
new file mode 100644
index 0000000000000..e7d91fc187425
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenAccountInformationTabFromCustomerEditPageActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="AdminOpenAccountInformationTabFromCustomerEditPageActionGroup">
+        <annotations>
+            <description>Open Account Information tab from Customer's edit page</description>
+        </annotations>
+        <waitForElementVisible selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="waitForAccountInformationTab"/>
+        <click selector="{{AdminCustomerAccountInformationSection.accountInformationTab}}" stepKey="clickAccountInformationTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>

From e6df759a4a535b0172e3e652e36c9d98fd8416b9 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Tue, 17 Nov 2020 10:26:33 -0600
Subject: [PATCH 05/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Cleaning up StorefrontVerifyOrdersVisibleInCompanyStructureAcrossMultipleWebsitesTest
 - Adding inline comments to before & after sections
---
 ...enCheckoutPageInCustomStoreActionGroup.xml | 20 +++++++++++++++++++
 .../StorefrontCustomStoreCheckoutPage.xml     | 20 +++++++++++++++++++
 ...ntCustomStoreCustomerLogoutActionGroup.xml | 20 +++++++++++++++++++
 .../StorefrontCustomStoreLoginActionGroup.xml | 20 +++++++++++++++++++
 ...ToCustomerOrdersHistoryPageActionGroup.xml | 19 ++++++++++++++++++
 ...torefrontCustomStoreCustomerLogoutPage.xml | 11 ++++++++++
 ...torefrontCustomStoreCustomerSignInPage.xml | 15 ++++++++++++++
 ...ntCustomStoreCustomerOrdersHistoryPage.xml | 14 +++++++++++++
 8 files changed, 139 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageInCustomStoreActionGroup.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Page/StorefrontCustomStoreCheckoutPage.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreCustomerLogoutActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomStoreCustomerLogoutPage.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomStoreCustomerSignInPage.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomStoreCustomerOrdersHistoryPage.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageInCustomStoreActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageInCustomStoreActionGroup.xml
new file mode 100644
index 0000000000000..11102702454e8
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageInCustomStoreActionGroup.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="StorefrontOpenCustomStoreCheckoutPageActionGroup" extends="StorefrontOpenCheckoutPageActionGroup">
+        <annotations>
+            <description>Goes to the Storefront Checkout page in a custom store. Must have Add Store Code To Urls enabled</description>
+        </annotations>
+        <arguments>
+            <argument name="storeCode"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomStoreCheckoutPage.url(storeCode)}}" stepKey="openCheckoutPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Page/StorefrontCustomStoreCheckoutPage.xml b/app/code/Magento/Checkout/Test/Mftf/Page/StorefrontCustomStoreCheckoutPage.xml
new file mode 100644
index 0000000000000..632687d049b1f
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Page/StorefrontCustomStoreCheckoutPage.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomStoreCheckoutPage" url="/{{storeCode}}/checkout" area="storefront" module="Magento_Checkout" parameterized="true">
+        <section name="StorefrontCheckoutPageMessagesSection"/>
+        <section name="CheckoutShippingSection"/>
+        <section name="CheckoutShippingMethodsSection"/>
+        <section name="CheckoutOrderSummarySection"/>
+        <section name="CheckoutSuccessMainSection"/>
+        <section name="CheckoutPaymentSection"/>
+        <section name="SelectShippingBillingPopupSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreCustomerLogoutActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreCustomerLogoutActionGroup.xml
new file mode 100644
index 0000000000000..ff1f29adf925d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreCustomerLogoutActionGroup.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="StorefrontCustomStoreCustomerLogoutActionGroup" extends="StorefrontCustomerLogoutActionGroup">
+        <annotations>
+            <description>Goes to the storefront Customer Logout page for a custom store. Must have Add Store Code To Urls enabled.</description>
+        </annotations>
+        <arguments>
+            <argument name="storeCode"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomStoreCustomerLogoutPage.url(storeCode)}}" stepKey="storefrontSignOut"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.xml
new file mode 100644
index 0000000000000..ff3f9658cd303
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.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="StorefrontCustomStoreLoginActionGroup" extends="LoginToStorefrontActionGroup">
+        <annotations>
+            <description>Goes to the storefront Customer Sign In page for a custom store. Logs in using the provided Customer. Must have Add Store Code To Urls enabled</description>
+        </annotations>
+        <arguments>
+            <argument name="storeCode"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomStoreCustomerSignInPage.url(storeCode)}}" stepKey="amOnSignInPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml
new file mode 100644
index 0000000000000..827128db663f7
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup" extends="StorefrontNavigateToCustomerOrdersHistoryPageActionGroup">
+        <annotations>
+            <description>Goes to the storefront Customer Order History page for a custom store. Must have Add Store Code To Urls enabled</description>
+        </annotations>
+        <arguments>
+            <argument name="storeCode"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCustomStoreCustomerOrdersHistoryPage.url(storeCode)}}" stepKey="amOnTheCustomerPage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomStoreCustomerLogoutPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomStoreCustomerLogoutPage.xml
new file mode 100644
index 0000000000000..c4f215470a3b7
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomStoreCustomerLogoutPage.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomStoreCustomerLogoutPage" url="/{{storeCode}}/customer/account/logout/" area="storefront" module="Magento_Customer" parameterized="true"/>
+</pages>
diff --git a/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomStoreCustomerSignInPage.xml b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomStoreCustomerSignInPage.xml
new file mode 100644
index 0000000000000..822aae12e8344
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomStoreCustomerSignInPage.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomStoreCustomerSignInPage" url="/{{storeCode}}/customer/account/login/" area="storefront" module="Magento_Customer" parameterized="true">
+        <section name="StorefrontCustomerSignInFormSection" />
+        <section name="StorefrontCustomerLoginMessagesSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomStoreCustomerOrdersHistoryPage.xml b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomStoreCustomerOrdersHistoryPage.xml
new file mode 100644
index 0000000000000..8393d4b490924
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Page/StorefrontCustomStoreCustomerOrdersHistoryPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="StorefrontCustomStoreCustomerOrdersHistoryPage" url="/{{storeCode}}/sales/order/history/" module="Magento_Sales" area="storefront" parameterized="true">
+        <section name="StorefrontCustomerOrdersGridSection"/>
+    </page>
+</pages>

From e1f6547f69c1d7dfa4251c9fc3d76322b7037f27 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Wed, 18 Nov 2020 08:47:27 -0600
Subject: [PATCH 06/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Fixing PR feedback
---
 ...orefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml | 2 +-
 .../ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml    | 2 +-
 .../ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml  | 2 +-
 .../StorefrontGoToCustomerAddressesPageActionGroup.xml          | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml
index ddff0153f93be..455d86d3709ac 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontClickOrderLinkFromCheckoutSuccessPageActionGroup.xml
@@ -14,6 +14,6 @@
         </annotations>
         <click selector="{{CheckoutSuccessMainSection.orderLink}}" stepKey="clickOrderLink"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForText selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="Order # " stepKey="waitForPageTitle"/>
+        <waitForText selector="{{StorefrontCustomerAccountMainSection.pageTitle}}" userInput="Order #" stepKey="waitForPageTitle"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml
index 7dff20dcb657b..132491da553a5 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerActiveViaGridActionGroup.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="AdminSetCustomerActiveViaGridActionGroup">
+    <actionGroup name="AdminSuccessfullySetCustomerActiveViaGridActionGroup">
         <annotations>
             <description>Sets a Customer to the Active status from the admin All Customers grid</description>
         </annotations>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml
index 94151d72dffcb..b7d5c335aa8db 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminSetCustomerInactiveViaGridActionGroup.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="AdminSetCustomerInactiveViaGridActionGroup" extends="AdminSetCustomerActiveViaGridActionGroup">
+    <actionGroup name="AdminSuccessfullySetCustomerInactiveViaGridActionGroup" extends="AdminSuccessfullySetCustomerActiveViaGridActionGroup">
         <annotations>
             <description>Sets a Customer to the Inactive status from the admin All Customers grid</description>
         </annotations>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerAddressesPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerAddressesPageActionGroup.xml
index 33287b87346e5..ba942d9a1d904 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerAddressesPageActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontGoToCustomerAddressesPageActionGroup.xml
@@ -12,6 +12,5 @@
             <description>Goes to the storefront customer addresses page</description>
         </annotations>
         <amOnPage url="{{StorefrontCustomerAddressesPage.url}}" stepKey="goToAddressPage"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
 </actionGroups>

From e42f90d5f1125a575b896d66ef412daf710aab70 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Thu, 19 Nov 2020 15:04:23 -0600
Subject: [PATCH 07/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Fixing StorefrontCreateAnOrderWithCompanyCreditAndPurchaseOrderNumberTest
 - Cleaning up StorefrontCreateAnOrderWithCompanyCreditTest
 - Cleaning up StorefrontCreateInvoiceForPendingOrderTest
---
 ...dminOpenOrderCommentsHistoryActionGroup.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderCommentsHistoryActionGroup.xml

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderCommentsHistoryActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderCommentsHistoryActionGroup.xml
new file mode 100644
index 0000000000000..a33abcc03c31f
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderCommentsHistoryActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminOpenOrderCommentsHistoryActionGroup">
+        <annotations>
+            <description>Clicks on the 'Comments History' on Admin View Order page.</description>
+        </annotations>
+        <click selector="{{AdminOrderDetailsOrderViewSection.commentsHistory}}" stepKey="clickOnTabCommentsHistory"/>
+        <waitForPageLoad stepKey="waitForComments"/>
+    </actionGroup>
+</actionGroups>

From 6cad7ae0064330ddb9ac01322b17f11d4e5ceb4b Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Thu, 19 Nov 2020 18:47:10 -0600
Subject: [PATCH 08/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Cleaning up StorefrontVerifyCompanyCreditStaticsForAnOrderWithOneRefundedProductTest
 - Cleaning up StorefrontVerifyCompanyCreditStaticsForAnOrderWithReimburseBalanceTest
 - Cleaning up StorefrontVerifyCreditAndCommentHistoryForCanceledOrderTest
 - Deprecating unused entities
---
 .../Test/Mftf/ActionGroup/SubmitCreditMemoActionGroup.xml  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/SubmitCreditMemoActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/SubmitCreditMemoActionGroup.xml
index 2605adbfc91a7..5e47f5fae2b93 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/SubmitCreditMemoActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/SubmitCreditMemoActionGroup.xml
@@ -9,9 +9,12 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SubmitCreditMemoActionGroup">
+        <arguments>
+            <argument name="refundButton" defaultValue="{{AdminCreditMemoTotalSection.submitRefundOfflineEnabled}}" type="string"/>
+        </arguments>
         <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
-        <waitForElementVisible selector="{{AdminCreditMemoTotalSection.submitRefundOfflineEnabled}}" stepKey="waitButtonEnabled"/>
-        <click selector="{{AdminCreditMemoTotalSection.submitRefundOfflineEnabled}}" stepKey="clickSubmitCreditMemo"/>
+        <waitForElementVisible selector="{{refundButton}}" stepKey="waitButtonEnabled"/>
+        <click selector="{{refundButton}}" stepKey="clickSubmitCreditMemo"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForMessageAppears"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="You created the credit memo." stepKey="seeCreditMemoCreateSuccess"/>
         <seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}$grabOrderId" stepKey="seeViewOrderPageCreditMemo"/>

From b459fcf50dc2a7fc43e3fd3715d23a6cf272ff23 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Fri, 20 Nov 2020 13:28:28 -0600
Subject: [PATCH 09/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Fixing failing tests
---
 .../Sales/Test/Mftf/ActionGroup/AdminSubmitOrderActionGroup.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSubmitOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSubmitOrderActionGroup.xml
index f53e41386a389..3670839545e82 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSubmitOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSubmitOrderActionGroup.xml
@@ -9,6 +9,7 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSubmitOrderActionGroup">
+        <scrollTo selector="{{OrdersGridSection.submitOrder}}" stepKey="scrollToSubmitButton"/>
         <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>

From 2762f8fc839722abca1c41b985a7c4561ae9138d Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Sun, 22 Nov 2020 10:40:38 -0600
Subject: [PATCH 10/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Fixing failing/flaky tests
---
 ...oryToAnotherPositionInCategoryTreeTest.xml | 23 ++++++++++++-------
 ...gRecalculationAfterCouponCodeAddedTest.xml |  5 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
index 654ddb4d8d872..8eb3d9bbb8063 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminMoveCategoryToAnotherPositionInCategoryTreeTest.xml
@@ -38,23 +38,27 @@
         <waitForPageLoad stepKey="waitForPageToLoad"/>
         <!-- Create three level deep sub Category -->
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickAddSubCategoryButton"/>
+        <waitForPageLoad stepKey="waitForAddSubCategoryClick1"/>
+        <waitForElementVisible selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" stepKey="waitForSubCategoryName1"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{FirstLevelSubCat.name}}" stepKey="fillSubCategoryName"/>
         <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveFirstLevelSubCategory"/>
-        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
         <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButtonAgain"/>
+        <waitForPageLoad stepKey="waitForAddSubCategoryClick2"/>
+        <waitForElementVisible selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" stepKey="waitForSubCategoryName2"/>
         <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SecondLevelSubCat.name}}" stepKey="fillSecondLevelSubCategoryName"/>
         <actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSecondLevelSubCategory"/>
-        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
+        <waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSaveSuccessMessage"/>
         <grabFromCurrentUrl stepKey="categoryId" regex="#\/([0-9]*)?\/$#" />
 
         <!-- Move Category to another position in category tree, but click cancel button -->
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="moveCategory"/>
-        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
+        <waitForText selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
         <click selector="{{AdminCategoryModalSection.cancel}}" stepKey="clickCancelButtonOnWarningPopup"/>
         <!-- Verify Category in store front page after clicking cancel button -->
         <amOnPage url="/$$createDefaultCategory.name$$/{{FirstLevelSubCat.name}}/{{SecondLevelSubCat.name}}.html" stepKey="seeTheCategoryInStoreFrontPage"/>
         <waitForPageLoad stepKey="waitForStoreFrontPageLoad"/>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeDefaultCategoryOnStoreNavigationBar"/>
         <dontSeeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SimpleSubCategory.name)}}" stepKey="dontSeeSubCategoryOnStoreNavigationBar"/>
         <!-- Verify breadcrumbs in store front page after clicking cancel button -->
         <grabMultiple selector="{{StorefrontNavigationSection.categoryBreadcrumbs}}"  stepKey="breadcrumbs"/>
@@ -67,17 +71,18 @@
         <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openTheAdminCategoryIndexPage"/>
         <actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
         <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree(SecondLevelSubCat.name)}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="DragCategory"/>
-        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessageForOneMoreTime"/>
+        <waitForText selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessageForOneMoreTime"/>
+        <waitForElementVisible selector="{{AdminCategoryModalSection.ok}}" stepKey="waitForOkButtonOnWarningPopup"/>
         <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
         <waitForPageLoad stepKey="waitTheForPageToLoad"/>
-        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
+        <waitForText selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You moved the category." stepKey="seeSuccessMoveMessage"/>
         <amOnPage url="/{{SimpleSubCategory.name}}.html" stepKey="seeCategoryNameInStoreFrontPage"/>
         <waitForPageLoad  stepKey="waitForStoreFrontPageToLoad"/>
         <!-- Verify Category in store front after moving category to another position in category tree -->
         <amOnPage url="{{StorefrontCategoryPage.url(SecondLevelSubCat.name)}}"  stepKey="amOnCategoryPage"/>
         <waitForPageLoad stepKey="waitForPageToBeLoaded"/>
-        <seeElement selector="{{StorefrontCategoryMainSection.CategoryTitle(SecondLevelSubCat.name)}}" stepKey="seeCategoryInTitle"/>
-        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
+        <waitForElementVisible selector="{{StorefrontCategoryMainSection.CategoryTitle(SecondLevelSubCat.name)}}" stepKey="seeCategoryInTitle"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="seeCategoryOnStoreNavigationBarAfterMove"/>
         <!-- Verify breadcrumbs in store front page after moving category to another position in category tree -->
         <click selector="{{StorefrontHeaderSection.NavigationCategoryByName(SecondLevelSubCat.name)}}" stepKey="clickCategoryOnNavigation"/>
         <waitForPageLoad stepKey="waitForCategoryLoad"/>
@@ -91,6 +96,7 @@
         <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="openUrlRewriteIndexPage"/>
         <waitForPageLoad stepKey="waitForUrlRewritePageLoad"/>
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters"/>
+        <waitForElementVisible selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" stepKey="waitForCategoryUrlKey"/>
         <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="{{SecondLevelSubCat.name_lwr}}.html" stepKey="fillCategoryUrlKey"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
         <waitForPageLoad stepKey="waitForSearch"/>
@@ -102,6 +108,7 @@
         <see selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('2', 'Redirect Type')}}" userInput="No" stepKey="verifyTheRedirectTypeAfterMove"/>
         <!-- Verify before move Redirect Path displayed with associated Target Path and Redirect Type-->
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>
+        <waitForElementVisible selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" stepKey="waitForTheCategoryUrlKey"/>
         <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="{{SecondLevelSubCat.name_lwr}}" stepKey="fillTheCategoryUrlKey"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters1"/>
         <waitForPageLoad stepKey="waitForSearch1"/>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
index 20b94d0f4ec8a..f31e8342ead23 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StoreFrontFreeShippingRecalculationAfterCouponCodeAddedTest.xml
@@ -87,8 +87,9 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see userInput="Your coupon was successfully applied." stepKey="seeSuccessMessage"/>
         <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder1"/>
-        <waitForPageLoad stepKey="waitForError"/>
-        <see stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
+        <!-- Cannot use waitForPageLoad as the below error message will disappear after a few seconds & waitForPageLoad will cause this test to be flaky -->
+        <comment userInput="BIC workaround" stepKey="waitForError"/>
+        <waitForText stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
         <amOnPage stepKey="navigateToShippingPage" url="{{CheckoutShippingPage.url}}"/>
         <waitForPageLoad stepKey="waitForShippingPageLoad"/>
         <click stepKey="chooseFlatRateShipping" selector="{{CheckoutShippingMethodsSection.shippingMethodRowByName('Flat Rate')}}"/>

From 4538ad04f8d1679c4501a2c02e8adb781ce23778 Mon Sep 17 00:00:00 2001
From: Dan Mooney <dmooney@adobe.com>
Date: Tue, 24 Nov 2020 11:13:55 -0600
Subject: [PATCH 11/14] MC-39333: Grids Frequently Fail to Load & Throw getData
 Undefined Error in Console

- Add Magento_Ui/js/grid/data-storage as a dependency to base grid provider component
---
 app/code/Magento/Ui/view/base/web/js/grid/provider.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/provider.js b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
index 2ba8bd73af910..021ae83eb1c7d 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/provider.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/provider.js
@@ -14,7 +14,8 @@ define([
     'uiLayout',
     'Magento_Ui/js/modal/alert',
     'mage/translate',
-    'uiElement'
+    'uiElement',
+    'Magento_Ui/js/grid/data-storage'
 ], function ($, _, utils, resolver, layout, alert, $t, Element) {
     'use strict';
 

From f60c89cec4b21a2884692dc748722de5cdb8fb53 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Tue, 24 Nov 2020 16:54:16 -0600
Subject: [PATCH 12/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Fixing PR feedback
 - Adding equals checks to company credit actiongroups
---
 .../StorefrontOpenCheckoutPageInCustomStoreActionGroup.xml      | 2 +-
 .../StorefrontCustomStoreCustomerLogoutActionGroup.xml          | 2 +-
 .../Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.xml  | 2 +-
 ...ustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageInCustomStoreActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageInCustomStoreActionGroup.xml
index 11102702454e8..3a9ffade0a8a2 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageInCustomStoreActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontOpenCheckoutPageInCustomStoreActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Goes to the Storefront Checkout page in a custom store. Must have Add Store Code To Urls enabled</description>
         </annotations>
         <arguments>
-            <argument name="storeCode"/>
+            <argument name="storeCode" defaultValue="{{customStoreEN.code}}" type="string"/>
         </arguments>
         <amOnPage url="{{StorefrontCustomStoreCheckoutPage.url(storeCode)}}" stepKey="openCheckoutPage"/>
     </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreCustomerLogoutActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreCustomerLogoutActionGroup.xml
index ff1f29adf925d..d7e25553da083 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreCustomerLogoutActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreCustomerLogoutActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Goes to the storefront Customer Logout page for a custom store. Must have Add Store Code To Urls enabled.</description>
         </annotations>
         <arguments>
-            <argument name="storeCode"/>
+            <argument name="storeCode" defaultValue="{{customStoreEN.code}}" type="string"/>
         </arguments>
         <amOnPage url="{{StorefrontCustomStoreCustomerLogoutPage.url(storeCode)}}" stepKey="storefrontSignOut"/>
     </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.xml
index ff3f9658cd303..41a6abba1ff2b 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreLoginActionGroup.xml
@@ -13,7 +13,7 @@
             <description>Goes to the storefront Customer Sign In page for a custom store. Logs in using the provided Customer. Must have Add Store Code To Urls enabled</description>
         </annotations>
         <arguments>
-            <argument name="storeCode"/>
+            <argument name="storeCode" defaultValue="{{customStoreEN.code}}" type="string"/>
         </arguments>
         <amOnPage url="{{StorefrontCustomStoreCustomerSignInPage.url(storeCode)}}" stepKey="amOnSignInPage"/>
     </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml
index 827128db663f7..399b684ba8974 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontCustomStoreNavigateToCustomerOrdersHistoryPageActionGroup.xml
@@ -12,7 +12,7 @@
             <description>Goes to the storefront Customer Order History page for a custom store. Must have Add Store Code To Urls enabled</description>
         </annotations>
         <arguments>
-            <argument name="storeCode"/>
+            <argument name="storeCode" defaultValue="{{customStoreEN.code}}" type="string"/>
         </arguments>
         <amOnPage url="{{StorefrontCustomStoreCustomerOrdersHistoryPage.url(storeCode)}}" stepKey="amOnTheCustomerPage"/>
     </actionGroup>

From d32287b730c0fd0923c849572d04609a4d9a11c7 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Wed, 25 Nov 2020 13:04:05 -0600
Subject: [PATCH 13/14] magento/partners-magento2b2b#370: [Determine Coverage]:
 Add Meaningful Titles and Descriptions For All MFTF Tests in the Company,
 CompanyCredit, CompanyPayment, CompanyShipping, & ConfigurableSharedCatalog
 Modules

 - Moving B2B elements from CE to B2B
---
 .../Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
index 40214b9c11fb0..dae6bfca9757d 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml
@@ -13,8 +13,8 @@
         <element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[@class='payment-method']//label//span[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
         <element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
         <element name="billingAddressSameAsShippingShared" type="checkbox" selector="#billing-address-same-as-shipping-shared"/>
-        <element name="paymentOnAccount" type="radio" selector="#companycredit"/>
-        <element name="paymentOnAccountLabel" type="text" selector="//span[text()='Payment on Account']"/>
+        <element name="paymentOnAccount" type="radio" selector="#companycredit" deprecated="Use StorefrontCheckoutPaymentSection.paymentOnAccount B2B repository"/>
+        <element name="paymentOnAccountLabel" type="text" selector="//span[text()='Payment on Account']" deprecated="Use StorefrontCheckoutPaymentSection.paymentOnAccountLabel in B2B repository"/>
         <element name="purchaseOrderNumber" type="input" selector="#po_number"/>
     </section>
 </sections>

From 77a5a147ca6186cf530bc58e7a2b55a3637b54e2 Mon Sep 17 00:00:00 2001
From: David Haecker <dhaecker@magento.com>
Date: Sat, 28 Nov 2020 20:50:21 -0600
Subject: [PATCH 14/14] magento/magento2-page-builder#559: User sees no
 predefined gutters

- Fixing failing tests
---
 .../StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml
index effd376ab4bfb..2d6f36c78edf6 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontDeleteSimpleProductFromMiniShoppingCartTest.xml
@@ -54,6 +54,7 @@
             <argument name="productName" value="$$simpleProduct.name$$"/>
         </actionGroup>
         <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
 
         <!--Check the minicart is empty and verify AssertProductAbsentInMiniShoppingCart-->
         <actionGroup ref="AssertMiniCartEmptyActionGroup" stepKey="miniCartEnpty"/>