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

 - Fix errors encountered when running tests on Jenkins

Author: leviv

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AdminCategoryActionGroup.xml

@@ -123,23 +123,24 @@
     <actionGroup name="FillNewProductCategory" >
         <arguments>
             <argument name="categoryName" defaultValue="Test Category" type="string"/>
+            <argument name="parentCategoryName" defaultValue="default" type="string"/>
         </arguments>
 
         <!-- Click on new Category -->
-        <click stepKey="clickNewCategory" selector="{{AdminProductCategoryCreationSection.newCategory}}" />
+        <click stepKey="clickNewCategory" selector="{{AdminProductCategoryCreationSection.newCategory}}"/>
         <waitForPageLoad stepKey="waitForFieldSet"/>
 
-        <fillField stepKey="fillCategoryName" selector="{{AdminProductCategoryCreationSection.nameInput}}" userInput="{{categoryName}}" />
+        <fillField stepKey="fillCategoryName" selector="{{AdminProductCategoryCreationSection.nameInput}}" userInput="{{categoryName}}"/>
 
-        <click stepKey="clickParentCategory" selector="{{AdminProductCategoryCreationSection.parentCategory}}" />
+        <!-- Search and select a parent catagory for the product -->
+        <click stepKey="clickParentCategory" selector="{{AdminProductCategoryCreationSection.parentCategory}}"/>
         <waitForPageLoad stepKey="waitForDropDownVisible"/>
+        <fillField stepKey="searchForParent" userInput="{{parentCategoryName}}" selector="{{AdminProductCategoryCreationSection.parentSearch}}"/>
+        <waitForPageLoad stepKey="waitForFieldResults"/>
+        <click stepKey="clickParent" selector="{{AdminProductCategoryCreationSection.parentSearchResult}}"/>
 
-        <click stepKey="clickDefaultParentCategory" selector="{{AdminProductCategoryCreationSection.parentCategoryDropdownDefaultOption}}" />
-
-        <click stepKey="createCategory" selector="{{AdminProductCategoryCreationSection.createCategory}}" />
-
+        <click stepKey="createCategory" selector="{{AdminProductCategoryCreationSection.createCategory}}"/>
         <waitForPageLoad stepKey="waitForCategoryCreated"/>
-
     </actionGroup>
 
     <!-- Actions to delete the category last made -->

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/CustomOptionsActionGroup.xml

@@ -20,16 +20,13 @@
             <argument name="productOption2"/>
         </arguments>
 
-        <!-- opens the custom option panel and clicks add options -->
-        <click stepKey="openCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}"/>
-        <waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
-
         <click stepKey="clickAddOptions" selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}"/>
         <waitForPageLoad stepKey="waitForAddProductPageLoad"/>
 
         <!-- Fill in the option and select the type of radio (once) -->
         <fillField stepKey="fillInOptionTitle" selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{customOptionName}}"/>
         <click stepKey="clickOptionTypeParent" selector="{{AdminProductCustomizableOptionsSection.lastOptionTypeParent}}"/>
+        <waitForPageLoad stepKey="waitForDropdownOpen"/>
         <click stepKey="clickOptionType" selector="{{AdminProductCustomizableOptionsSection.optionType('Radio Buttons')}}"/>
 
         <!-- Add three radio options based on the parameter -->
@@ -43,9 +40,6 @@
         <fillField stepKey="fillInValueTitle2" selector="{{AdminProductCustomizableOptionsSection.valueTitle}}" userInput="{{productOption2.title}}"/>
         <fillField stepKey="fillInValuePrice2" selector="{{AdminProductCustomizableOptionsSection.valuePrice}}" userInput="{{productOption2.price}}"/>
 
-        <!-- close the custom option dropdown -->
-        <click stepKey="closeCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}"/>
-        <waitForPageLoad stepKey="waitForCustomOptionsClose"/>
 
     </actionGroup>
 

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

@@ -9,15 +9,14 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminProductCategoryCreationSection">
-        <element name="firstExampleProduct" type="button" selector=".data-row:nth-of-type(1)" />
-        <element name="newCategory" type="button" selector="//button/span[text()='New Category']" />
-
-        <element name="nameInput" type="input" selector="input[name='name']" />
-
-        <element name="parentCategory" type="block" selector=".product_form_product_form_create_category_modal div[data-role='selected-option']" />
-        <element name="parentCategoryDropdownDefaultOption" type="block" selector=".product_form_product_form_create_category_modal .action-menu-item._expended .admin__action-multiselect-label" />
-        <element name="createCategory" type="button" selector="#save" />
+        <element name="firstExampleProduct" type="button" selector=".data-row:nth-of-type(1)"/>
+        <element name="newCategory" type="button" selector="//button/span[text()='New Category']"/>
 
+        <element name="nameInput" type="input" selector="input[name='name']"/>
 
+        <element name="parentCategory" type="block" selector=".product_form_product_form_create_category_modal div[data-role='selected-option']"/>
+        <element name="parentSearch" type="input" selector="aside input[data-role='advanced-select-text']"/>
+        <element name="parentSearchResult" type="block" selector="aside .admin__action-multiselect-menu-inner"/>
+        <element name="createCategory" type="button" selector="#save"/>
     </section>
 </sections>

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

@@ -13,19 +13,19 @@
             <features value="Catalog"/>
             <stories value="Create/Edit Category in Admin"/>
             <description value="Admin should be able to create category from the product page" />
-            <severity value="AVERAGE" />
-            <testCaseId value="MC-234" />
-            <group value="Catalog"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="MC-234"/>
+            <group value="Levi"/>
         </annotations>
         <before>
             <!-- Login as admin -->
-            <createData entity="SimpleTwo" stepKey="simpleProduct" />
+            <createData entity="SimpleTwo" stepKey="simpleProduct"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
 
         <after>
             <!-- Delete the created category -->
-            <actionGroup ref="DeleteMostRecentCategory" stepKey="getRidOfCreatedCategory" />
+            <actionGroup ref="DeleteMostRecentCategory" stepKey="getRidOfCreatedCategory"/>
             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
             <deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
         </after>
@@ -43,12 +43,12 @@
 
         <!-- Fill out the form for the new category -->
         <actionGroup ref="FillNewProductCategory" stepKey="FillNewProductCategory">
-            <argument name="categoryName" value="{{_defaultCategory.name}}" />
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
         </actionGroup>
 
         <!-- Check that category was created -->
         <actionGroup ref="CategoryPresent" stepKey="checkIfCategoryPresent">
-            <argument name="categoryName" value="{{_defaultCategory.name}}" />
+            <argument name="categoryName" value="{{_defaultCategory.name}}"/>
         </actionGroup>
 
     </test>

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="Catalog"/>
+            <group value="Levi"/>
         </annotations>
         <before>
             <!-- log in as admin -->
@@ -39,7 +39,10 @@
             </actionGroup>
             <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
         </after>
-        <!-- ADD TEST STEPS HERE -->
+
+        <!-- opens the custom option panel and clicks add options -->
+        <click stepKey="openCustomizableOptions" selector="{{AdminProductCustomizableOptionsSection.customezableOptions}}"/>
+        <waitForPageLoad stepKey="waitForCustomOptionsOpen"/>
 
         <!-- Create a custom option with 2 values -->
         <actionGroup ref="CreateCustomRadioOptions" stepKey="createCustomOption1">