MAGETWO-97278: Incorrect use of cookies for customer

Author: StasKozar

app/code/Magento/Customer/Test/Mftf/Page/StorefrontCustomerLogoutSuccessPage.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="StorefrontCustomerLogoutSuccessPage" url="customer/account/logoutSuccess/" area="storefront" module="Magento_Customer"/>
+</pages>

app/code/Magento/Persistent/Block/Header/Additional.php

@@ -103,8 +103,7 @@ public function getCustomerId(): int
      */
     public function getConfig(): string
     {
-        return
-            $this->jsonSerializer->serialize(
+        return $this->jsonSerializer->serialize(
                 [
                     'expirationLifetime' => $this->persistentHelper->getLifeTime(),
                 ]

app/code/Magento/Persistent/Model/Plugin/PersistentCustomerContext.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Persistent\Model\Plugin;
 
 /**

app/code/Magento/Persistent/Test/Mftf/Test/StorefrontCorrectWelcomeMessageAfterCustomerIsLoggedOutTest.xml

@@ -48,13 +48,13 @@
         </actionGroup>
 
         <!--Check customer name and last name in welcome message-->
-        <seeCurrentUrlMatches regex="~/customer/account/~" stepKey="seeCustomerAccountPageUrl"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerDashboardPage.url}}" stepKey="seeCustomerAccountPageUrl"/>
         <see userInput="Welcome, $$createCustomer.firstname$$ $$createCustomer.lastname$$!"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seeLoggedInCustomerWelcomeMessage"/>
         <!--Logout and check default welcome message-->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout"/>
-        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" wait="5" stepKey="seeCustomerSignOutPageUrl"/>
         <see userInput="Default welcome msg!"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seeDefaultWelcomeMessage"/>
@@ -64,14 +64,14 @@
             <argument name="Customer" value="$$createCustomerForPersistent$$"/>
         </actionGroup>
         <!--Check customer name and last name in welcome message-->
-        <seeCurrentUrlMatches regex="~/customer/account/~" stepKey="seeCustomerAccountPageUrl1"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerDashboardPage.url}}" stepKey="seeCustomerAccountPageUrl1"/>
         <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$!"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seeLoggedInCustomerWelcomeMessage1"/>
 
         <!--Logout and check persistent customer welcome message-->
         <actionGroup ref="CustomerLogoutStorefrontByMenuItemsActionGroup" stepKey="storefrontCustomerLogout1"/>
-        <seeCurrentUrlMatches regex="~/customer/account/logoutSuccess/~" wait="5" stepKey="seeCustomerSignOutPageUrl1"/>
+        <seeInCurrentUrl url="{{StorefrontCustomerLogoutSuccessPage.url}}" wait="5" stepKey="seeCustomerSignOutPageUrl1"/>
         <see userInput="Welcome, $$createCustomerForPersistent.firstname$$ $$createCustomerForPersistent.lastname$$! Not you?"
              selector="{{StorefrontHeaderSection.welcomeMessage}}"
              stepKey="seePersistentWelcomeMessage"/>

app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml

@@ -19,7 +19,6 @@
         <element name="emailCopy" type="checkbox" selector=".order-totals-actions #send_email"/>
         <element name="refundStoreCredit" type="checkbox" selector=".order-totals-actions .field-refund-store-credit input[type='checkbox']"/>
         <element name="submitRefundOffline" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button']" timeout="30"/>
-        <element name="submitRefundOfflineEnabled" type="button" selector=".order-totals-actions button[data-ui-id='order-items-submit-button'][class='action-default scalable save submit-button primary']" timeout="30"/>
         <element name="creditMemoItem" type="text" selector="#sales_order_view_tabs_order_creditmemos"/>
         <element name="viewMemo" type="text" selector="div#sales_order_view_tabs_order_creditmemos_content a.action-menu-item"/>
     </section>

app/code/Magento/Sales/Test/Mftf/Section/AdminInvoiceItemsSection.xml

@@ -28,6 +28,5 @@
         <element name="discountAmountColumn" type="text" selector=".order-invoice-tables .col-discount .price"/>
         <element name="totalColumn" type="text" selector=".order-invoice-tables .col-total .price"/>
         <element name="updateQty" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button']"/>
-        <element name="updateQtyEnabled" type="button" selector=".order-invoice-tables tfoot button[data-ui-id='order-items-update-button'][class='action-default scalable update-button']"/>
     </section>
 </sections>