ACQE-8277: Use empty file as a Custom Option of File type

- Fixed review comments

Author: Naveen-AC24

app/code/Magento/Catalog/Test/Mftf/ActionGroup/VerifyErrorMessageDisplayedWhileAddingProductWithEmptyFileToCartActionGroup.xml renamed to app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontVerifyErrorMessageDisplayedWhileAddingProductWithEmptyFileToCartActionGroup.xml

@@ -5,15 +5,16 @@
   * All Rights Reserved.
   */
 -->
+
 <actionGroups
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="VerifyErrorMessageDisplayedWhileAddingProductWithEmptyFileToCartActionGroup" extends="AddToCartFromStorefrontProductPageActionGroup">
+    <actionGroup name="StorefrontVerifyErrorMessageDisplayedWhileAddingProductWithEmptyFileToCartActionGroup" extends="AddToCartFromStorefrontProductPageActionGroup">
         <arguments>
             <argument name="productName" type="string"/>
         </arguments>
         <remove keyForRemoval="waitForSuccessMessage"/>
         <remove keyForRemoval="seeAddToCartSuccessMessage"/>
-        <waitForText selector="{{StorefrontProductInfoMainSection.customEmptyFileValidationMessage}}" userInput="{{EmptyFilesAndValidationMessage.fileValidationMessage}}" stepKey="verify"/>
+        <waitForText selector="{{StorefrontProductInfoMainSection.customEmptyFileValidationMessage}}" userInput="{{EmptyFileValidationMessage.fileValidationMessage}}" stepKey="verifyEmptyFileValidationMessage"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

@@ -1604,9 +1604,4 @@
         <requiredEntity type="product_option">ProductOptionField20</requiredEntity>
         <requiredEntity type="product_option">ProductOptionField21</requiredEntity>
     </entity>
-    <entity name="EmptyFilesAndValidationMessage">
-        <data key="file1">emptyTxtFile.txt</data>
-        <data key="file2">emptyPngFile.png</data>
-        <data key="fileValidationMessage">The file is empty. Select another file and try again.</data>
-    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Data/ProductOptionData.xml

@@ -456,5 +456,14 @@
         <data key="price">9.99</data>
         <data key="price_type">fixed</data>
         <data key="file_extension">txt</data>
+        <data key="image_size_x">500</data>
+        <data key="image_size_y">500</data>
+    </entity>
+    <entity name="EmptyFiles">
+        <data key="file1">emptyTxtFile.txt</data>
+        <data key="file2">emptyPngFile.png</data>
+    </entity>
+    <entity name="EmptyFileValidationMessage">
+        <data key="fileValidationMessage">The file is empty. Select another file and try again.</data>
     </entity>
 </entities>

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

@@ -5,11 +5,13 @@
   * All Rights Reserved.
   */
 -->
+
 <tests
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StoreFrontUseEmptyFileAsACustomOptionOfFileTypeTest">
         <annotations>
+            <features value="Catalog"/>
             <stories value="Empty file as a custom option for the file type"/>
             <title value="Product custom options"/>
             <description value="Verify the validation of an empty file as a custom option for the file type."/>
@@ -20,14 +22,14 @@
         <before>
             <!-- Pre-condition 1:Create Simple Product -->
             <createData entity="defaultSimpleProduct" stepKey="initialSimpleProduct"/>
-            <!-- Login As Admin -->
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <!-- Delete product, Logout from Admin -->
             <deleteData createDataKey="initialSimpleProduct" stepKey="deleteSimpleProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
+        <!-- Login As Admin -->
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <!-- Step1: Open a product page in Admin and Open Customizable options tab.-->
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openProductForEdit">
             <argument name="productId" value="$initialSimpleProduct.id$"/>
@@ -46,10 +48,10 @@
         </actionGroup>
         <!-- Step4: Upload an empty file -->
         <actionGroup ref="StorefrontAttachOptionFileActionGroup" stepKey="selectAndAttachFile">
-            <argument name="file" value="EmptyFilesAndValidationMessage.file1" />
+            <argument name="file" value="EmptyFiles.file1" />
         </actionGroup>
-        <!--Step4: Verify An error should be displayed when adding to cart -->
-        <actionGroup ref="VerifyErrorMessageDisplayedWhileAddingProductWithEmptyFileToCartActionGroup" stepKey="addProductToCart">
+        <!--Step4 Assertion: Verify An error should be displayed when adding to cart -->
+        <actionGroup ref="StorefrontVerifyErrorMessageDisplayedWhileAddingProductWithEmptyFileToCartActionGroup" stepKey="addProductToCart">
             <argument name="productName" value="$initialSimpleProduct.name$"/>
         </actionGroup>
         <!-- Open product in admin and delete existing custom option-->
@@ -73,10 +75,10 @@
         </actionGroup>
         <!--Step7: Upload an empty image  -->
         <actionGroup ref="StorefrontAttachOptionFileActionGroup" stepKey="selectAndAttachTheFile">
-            <argument name="file" value="EmptyFilesAndValidationMessage.file2" />
+            <argument name="file" value="EmptyFiles.file2" />
         </actionGroup>
-        <!-- Step7: Verify An error should be displayed when adding to cart  -->
-        <actionGroup ref="VerifyErrorMessageDisplayedWhileAddingProductWithEmptyFileToCartActionGroup" stepKey="addTheProductToCart">
+        <!-- Step7 Assertion: Verify An error should be displayed when adding to cart  -->
+        <actionGroup ref="StorefrontVerifyErrorMessageDisplayedWhileAddingProductWithEmptyFileToCartActionGroup" stepKey="addTheProductToCart">
             <argument name="productName" value="$initialSimpleProduct.name$"/>
         </actionGroup>
     </test>