MC-38676: Fixed force logout after email change

Author: SeruyV

app/code/Magento/Customer/Controller/Account/EditPost.php

@@ -7,7 +7,6 @@
 
 namespace Magento\Customer\Controller\Account;
 
-use Exception;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\SessionCleanerInterface;
 use Magento\Customer\Model\AddressRegistry;
@@ -245,7 +244,7 @@ public function execute()
                 }
             } catch (LocalizedException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                 $this->messageManager->addException($e, __('We can\'t save the customer.'));
             }
 

app/code/Magento/Customer/Test/Mftf/Test/StorefrontChangeCustomerEmailTest.xml

@@ -14,18 +14,19 @@
             <stories value="Update Customer"/>
             <title value="Changing Customer Email Test"/>
             <description value="Changing Customer's email with correct and wrong passwords"/>
-            <testCaseId value="MC-38725"/>
+            <testCaseId value="MC-38729"/>
+            <useCaseId value="MC-38676"/>
             <severity value="MAJOR"/>
             <group value="customer"/>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="customer"/>
         </before>
         <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
 
-        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStorefrontHomePage"/>
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
             <argument name="Customer" value="$customer$"/>
         </actionGroup>
@@ -46,7 +47,7 @@
         </actionGroup>
         <!-- Navigate to "Account Information" tab Second Time-->
         <actionGroup ref="StorefrontOpenCustomerAccountInfoEditPageActionGroup" stepKey="goToCustomerEditPageSecondTime" />
-        <!-- Checking Email checkbox, entering new email, saving with incorrect password -->
+        <!-- Entering new email, saving with wrong password -->
         <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailWrongAttempt">
             <argument name="email" value="$customer.email$"/>
             <argument name="password" value="WRONG_PASSWORD_123123q"/>