MC-234: Admin should be able to create category from the product page

 - Account for admin product creation on b2b and ee

Author: leviv

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

@@ -18,9 +18,7 @@
         <element name="FolderName" type="text" selector="//span[text()='{{var1}}']" parameterized="true"/>
     </section>
     <section name="ModifyAttributes">
-        <!-- Parameter is the order number of the attribute on the page (1 is the newest) -->
-        <element name="nthExistingAttribute" type="block" selector=".admin__field:nth-of-type({{numElement}}) .admin__control-select" parameterized="true"/>
-        <!-- First parameter is the order number of the attribute on the page, 2nd parameter is the number option in the dropdown (1 for blank) -->
-        <element name="nthAttributeOption" type="block" selector=".admin__field:nth-of-type({{numElement}}) .admin__control-select option:nth-of-type({{numOption}})" parameterized="true"/>
+        <!-- Parameter is the attribute name -->
+        <element name="nthExistingAttribute" type="select" selector="//*[text()='{{attributeName}}']/../..//select" parameterized="true"/>
     </section>
 </sections>

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

@@ -15,7 +15,7 @@
             <description value="Admin should be able to create category from the product page" />
             <severity value="AVERAGE"/>
             <testCaseId value="MC-234"/>
-            <group value="Levi"/>
+            <group value="Catalog"/>
         </annotations>
         <before>
             <!-- Login as admin -->

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

@@ -16,7 +16,7 @@
             <description value="Admin should be able to create simple product with two custom options"/>
             <severity value="AVERAGE"/>
             <testCaseId value="MC-248"/>
-            <group value="Levi"/>
+            <group value="Catalog"/>
         </annotations>
         <before>
             <!-- log in as admin -->

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/AdminConfigurableProductUpdateAttributeTest.xml

@@ -36,7 +36,6 @@
                 <requiredEntity createDataKey="createModifiableProductAttribute"/>
             </createData>
 
-
             <!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->
             <!-- Create the category the product will be a part of -->
             <createData entity="ApiCategory" stepKey="createCategory"/>
@@ -111,6 +110,7 @@
         <!-- Get the current option of the attribute before it was changed -->
         <amOnPage url="/{{ApiConfigurableProduct.urlKey}}2.html" stepKey="goToConfigProductPage"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
+
         <grabTextFrom stepKey="getBeforeOption" selector="{{StorefrontProductInfoMainSection.nthAttributeOnPage('1')}}"/>
 
         <!-- Find the product that we just created using the product grid -->
@@ -126,9 +126,7 @@
         <waitForPageLoad stepKey="waitForProductPageLoad"/>
 
         <!-- change the option on the first attribute -->
-        <click stepKey="clickFirstAttribute" selector="{{ModifyAttributes.nthExistingAttribute('1')}}"/>
-
-        <click stepKey="clickSecondAttributeOption" selector="{{ModifyAttributes.nthAttributeOption('1', '2')}}"/>
+        <selectOption stepKey="clickFirstAttribute" selector="{{ModifyAttributes.nthExistingAttribute($$createModifiableProductAttribute.default_frontend_label$$)}}" userInput="option1"/>
 
         <!-- Save the product -->
         <click stepKey="saveProductAttribute" selector="{{AdminProductFormActionSection.saveButton}}"/>