MC-244: Admin should be able to create a simple product using a custom attribute set

- Fix flaky Jenkins failure

Author: tomreece

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml

@@ -10,6 +10,7 @@
     <section name="AdminProductFormSection">
         <element name="attributeSet" type="select" selector="div[data-index='attribute_set_id'] .admin__field-control"/>
         <element name="attributeSetFilter" type="input" selector="div[data-index='attribute_set_id'] .admin__field-control input"/>
+        <element name="attributeSetFilterResult" type="input" selector="div[data-index='attribute_set_id'] .action-menu-item._last"/>
         <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
         <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
         <element name="productStatus" type="checkbox" selector="input[name='product[status]']"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/AdminCreateProductCustomAttributeSet.xml

@@ -45,28 +45,31 @@
         <fillField selector="{{AdminProductAttributeSetSection.name}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="fillName"/>
         <selectOption selector="{{AdminProductAttributeSetSection.basedOn}}" userInput="Default" stepKey="selectDefaultSet"/>
         <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave1"/>
-        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('color')}}" selector2="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" stepKey="unassignColor"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('news_from_date')}}" selector2="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" stepKey="unassign1"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('news_to_date')}}" selector2="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" stepKey="unassign2"/>
         <click selector="{{AdminProductAttributeSetSection.addNewGroupBtn}}" stepKey="clickAddNewGroup"/>
         <fillField selector="{{AdminProductAttributeSetSection.newGroupName}}" userInput="TestGroupName" stepKey="fillNewGroupName"/>
         <click selector="{{AdminProductAttributeSetSection.modalOk}}" stepKey="clickOkInModal"/>
         <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute('manufacturer')}}" selector2="{{AdminProductAttributeSetSection.attribute('TestGroupName')}}" stepKey="assignManufacturer"/>
         <click selector="{{AdminProductAttributeSetSection.saveBtn}}" stepKey="clickSave2"/>
 
-        <!-- Go to new product page and see a default attribute (color) -->
+        <!-- Go to new product page and see a default attribute -->
         <amOnPage url="{{AdminProductCreatePage.url('4', 'simple')}}" stepKey="goToNewProductPage"/>
         <waitForPageLoad stepKey="wait2"/>
-        <seeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('color')}}" stepKey="seeColor"/>
+        <seeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('news_from_date')}}" stepKey="seeNewsFromDate"/>
+        <seeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('news_to_date')}}" stepKey="seeNewsToDate"/>
         <dontSeeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('testgroupname')}}" stepKey="dontSeeTestGroupName"/>
 
         <!-- Switch from default attribute set to new attribute set -->
         <click selector="{{AdminProductFormSection.attributeSet}}" stepKey="startEditAttrSet"/>
         <fillField selector="{{AdminProductFormSection.attributeSetFilter}}" userInput="{{ProductAttributeFrontendLabel.label}}" stepKey="searchForAttrSet"/>
-        <click selector="div[data-index='attribute_set_id'] .action-menu-item._last" stepKey="selectAttrSet"/> <!-- todo: reusable selector -->
+        <click selector="{{AdminProductFormSection.attributeSetFilterResult}}" stepKey="selectAttrSet"/>
         <waitForPageLoad stepKey="wait3"/>
 
         <!-- See new attibute set -->
-        <dontSeeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('color')}}" stepKey="dontSeeColor"/>
         <seeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('testgroupname')}}" stepKey="seeTestGroupName"/>
+        <dontSeeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('news_from_date')}}" stepKey="dontSeeNewsFromDate"/>
+        <dontSeeElementInDOM selector="{{AdminProductFormSection.divByDataIndex('news_to_date')}}" stepKey="dontSeeNewsToDate"/>
 
         <!-- Finish filling the new product page -->
         <actionGroup ref="fillMainProductFormNoWeight" stepKey="fillSimpleProductMain">