ACP2E-2404: [Magento Cloud] Bug of product custom option validation in product view page

Author: Sarmistha

app/code/Magento/Catalog/Test/Mftf/Test/ProductViewPageCustomOptionValidationErrorMessageTest.xml

@@ -20,31 +20,32 @@
             <group value="Catalog"/>
         </annotations>
         <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin" />
             <createData entity="SimpleProduct2" stepKey="createProduct"/>
+            <!-- open product edit page -->
+            <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
+                <argument name="productId" value="$$createProduct.id$$"/>
+            </actionGroup>
+            <!-- Create a custom option(radio button) with 2 values -->
+            <click stepKey="openCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}"/>
+            <waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
+            <actionGroup ref="CreateCustomRadioOptionsActionGroup" stepKey="createCustomOption1">
+                <argument name="customOptionName" value="ProductOptionRadiobutton.title"/>
+                <argument name="productOption" value="ProductOptionField"/>
+                <argument name="productOption2" value="ProductOptionField2"/>
+            </actionGroup>
+            <!-- Save the product -->
+            <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
+            <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
+            <!-- indexer reindex -->
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin" />
-        <!-- open product edit page -->
-        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
-            <argument name="productId" value="$$createProduct.id$$"/>
-        </actionGroup>
-        <!-- Create a custom option(radio button) with 2 values -->
-        <click stepKey="openCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}"/>
-        <waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
-        <actionGroup ref="CreateCustomRadioOptionsActionGroup" stepKey="createCustomOption1">
-            <argument name="customOptionName" value="ProductOptionRadiobutton.title"/>
-            <argument name="productOption" value="ProductOptionField"/>
-            <argument name="productOption2" value="ProductOptionField2"/>
-        </actionGroup>
-        <!-- Save the product -->
-        <actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
-        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/>
-        <!-- indexer reindex -->
-        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
-            <argument name="indices" value=""/>
-        </actionGroup>
         <!-- Navigate to Product Page on StoreFront -->
         <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openStorefrontProductPage">
             <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>