MC-17552: Saving configurable product with custom product attribute (images as swatches)

Fixed selector

Author: mkovdrysh

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

@@ -96,9 +96,13 @@
             <argument name="attributeCode" value="{{productVisualSwatchAttribute.attribute_code}}"/>
         </actionGroup>
 
+        <!-- Using this action to concatenate 2 strings to have unique identifier for grid -->
+        <executeJS function="return '{{productVisualSwatchAttribute.attribute_code}}: red'" stepKey="attributeCodeRed"/>
+        <executeJS function="return '{{productVisualSwatchAttribute.attribute_code}}: blue'" stepKey="attributeCodeBlue"/>
+
         <!-- Add images for the products -->
-        <attachFile selector="{{AdminProductFormConfigurationsSection.addImageByAttributeOption('red')}}" userInput="{{MagentoLogo.file}}" stepKey="uploadImageForFirstProduct"/>
-        <attachFile selector="{{AdminProductFormConfigurationsSection.addImageByAttributeOption('blue')}}" userInput="{{ProductImage.file}}" stepKey="uploadImageForSecondProduct"/>
+        <attachFile selector="{{AdminDataGridTableSection.rowTemplate({$attributeCodeRed})}}{{AdminProductFormConfigurationsSection.fileUploaderInput}}" userInput="{{MagentoLogo.file}}" stepKey="uploadImageForFirstProduct"/>
+        <attachFile selector="{{AdminDataGridTableSection.rowTemplate({$attributeCodeBlue})}}{{AdminProductFormConfigurationsSection.fileUploaderInput}}" userInput="{{ProductImage.file}}" stepKey="uploadImageForSecondProduct"/>
 
         <!-- Click "Save" button -->
         <actionGroup ref="saveProductForm" stepKey="clickSaveButton"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml

@@ -26,6 +26,6 @@
         <element name="skuValidationMessage" type="text" selector="input[name='configurable-matrix[{{index}}][sku]'] + label" parameterized="true"/>
         <element name="stepsWizardTitle" type="text" selector="div.content:not([style='display: none;']) .steps-wizard-title"/>
         <element name="attributeEntityByName" type="text" selector="//div[@class='attribute-entity']//div[normalize-space(.)='{{attributeLabel}}']" parameterized="true"/>
-        <element name="addImageByAttributeOption" type="file" selector="//*[.='Attributes']/ancestor::tr//span[contains(text(), '{{option}}')]/ancestor::tr//input[@class='file-uploader-input']" parameterized="true"/>
+        <element name="fileUploaderInput" type="file" selector="//input[@type='file' and @class='file-uploader-input']"/>
     </section>
 </sections>

app/code/Magento/Ui/Test/Mftf/Section/AdminDataGridTableSection.xml

@@ -22,5 +22,6 @@
         <element name="rowEditAction" type="button" selector="[data-role='grid'] tbody tr .action-select-wrap._active [data-action='item-edit']" timeout="30"/>
         <element name="dataGridEmpty" type="block" selector=".data-grid-tr-no-data td"/>
         <element name="dataGridWrap" type="block" selector=".admin__data-grid-wrap"/>
+        <element name="rowTemplate" type="block" selector="//tbody/tr[td[*[contains(.,normalize-space('{{text}}'))]]]" parameterized="true" />
     </section>
 </sections>