MAGETWO-94021: Problems with adding products in wish list

- updated annotations and cleaned up the test

Author: dthampy

app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerWishlistActionGroup.xml

@@ -28,28 +28,9 @@
         <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productVar.name)}}" stepKey="addCategoryProductToWishlistMoveMouseOverProduct" />
         <!--<click selector="{{StorefrontCategoryProductSection.ProductAddToSplitWishlistByName(productVar.name)}}" stepKey="addCategoryProductToWishlistClickAddProductToWishlist"/>-->
         <click selector="{{StorefrontCategoryProductSection.addToWishListArrow(productVar.name)}}" stepKey="clickAddToWishlist"/>
-        <click selector="{{StorefrontCategoryProductSection.chooseWishlist}}" stepKey="selectWishlist"/>
-
+        <clickWithLeftButton selector="{{StorefrontCategoryProductSection.chooseWishlist(productVar.name)}}" x="96" y="5" stepKey="selectWishlistWithOffset"/>
         <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addCategoryProductToWishlistWaitForSuccessMessage"/>
-        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List." stepKey="addCategoryProductToWishlistSeeProductNameAddedToWishlist"/>
-        <seeCurrentUrlMatches regex="~/wishlist_id/\d+/$~" stepKey="seeCurrentUrlMatches"/>
-    </actionGroup>
-
-    <actionGroup name="StorefrontCustomerAddCategoryProductToWishlistActionGroup3">
-        <arguments>
-            <argument name="productVar"/>
-        </arguments>
-        <moveMouseOver selector="{{StorefrontCategoryProductSection.ProductInfoByName(productVar.name)}}" stepKey="addCategoryProductToWishlistMoveMouseOverProduct" />
-        <!--<click selector="{{StorefrontCategoryProductSection.ProductAddToSplitWishlistByName(productVar.name)}}" stepKey="addCategoryProductToWishlistClickAddProductToWishlist"/>-->
-        <click selector="{{StorefrontCategoryProductSection.addToWishListArrow(productVar.name)}}" stepKey="clickDropdownToAddToWishlist"/>
-        <!--<click selector="{{StorefrontCategoryProductSection.testWishlist(productVar.name)}}" stepKey="chooseWishlistSpan"/>-->
-        <!--<scrollTo selector="{{StorefrontCategoryProductSection.testWishlist(productVar.name)}}" x="-10" y="10" stepKey="selectWishlistwithOffset"/>-->
-        <!--<scrollTo selector="{{StorefrontCategoryProductSection.chooseWishlist}}" x="10" y="10" stepKey="selectWishlistwithOffset"/>-->
-        <!--<clickWithLeftButton selector="{{StorefrontCategoryProductSection.chooseWishlist}}" x="-90" y="0" stepKey="selectWishlistWithOffset"/>-->
-        <clickWithLeftButton selector="{{StorefrontCategoryProductSection.testWishlist(productVar.name)}}" x="90" y="0" stepKey="selectWishlistWithOffset"/>
-
-        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addCategoryProductToWishlistWaitForSuccessMessage"/>
-        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List." stepKey="addCategoryProductToWishlistSeeProductNameAddedToWishlist"/>
+        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List." stepKey="SeeProductNameAddedToWishlist"/>
         <seeCurrentUrlMatches regex="~/wishlist_id/\d+/$~" stepKey="seeCurrentUrlMatches"/>
     </actionGroup>
 

app/code/Magento/Wishlist/Test/Mftf/Section/StorefrontCategoryProductSection.xml

@@ -12,7 +12,6 @@
         <element name="ProductAddToWishlistByNumber" type="text" selector="//main//li[{{var1}}]//a[contains(@class, 'towishlist')]" parameterized="true"/>
         <element name="ProductAddToWishlistByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'towishlist')]" parameterized="true"/>
         <element name="addToWishListArrow" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//button[@title='Add to:']" parameterized="true"/>
-        <element name="chooseWishlist" type="button" selector="span[title='Wish List']" timeout="30"/>
-        <element name="testWishlist" type="button" selector="(//main//li[.//a[contains(text(), '{{var1}}')]]//li[contains(@class,'item')]/span)[1]" parameterized="true"/>
+        <element name="chooseWishlist" type="button" selector="(//main//li[.//a[contains(text(), '{{var1}}')]]//li[contains(@class,'item')]/span)[1]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Wishlist/Test/Mftf/Test/StoreFrontAddProductsToWishListWithMultipleWishlistsEnabledTest.xml

@@ -10,10 +10,10 @@
     <test name="StoreFrontAddProductsToWishListWithMultipleWishlistsEnabledTest">
         <annotations>
             <stories value="Wishlist"/>
-            <title value="Add products from the wishlist to the cart using the sidebar."/>
-            <description value="Products added to the cart from wishlist and a customer remains on the same page."/>
+            <title value="Add products to wishlist from Category page with multiple wishlist enabled"/>
+            <description value="Registered customer should be able to add products from category page to wishlist when multiple wishlist enabled"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-94021"/>
+            <testCaseId value="MAGETWO-94422"/>
             <group value="wishlist"/>
         </annotations>
         <before>
@@ -22,10 +22,6 @@
             <createData entity="SimpleProduct" stepKey="simpleProduct1">
                 <requiredEntity createDataKey="categoryFirst"/>
             </createData>
-            <!--<createData entity="SimpleProduct" stepKey="simpleProduct2">-->
-                <!--<requiredEntity createDataKey="categoryFirst"/>-->
-            <!--</createData>-->
-
             <createData entity="Simple_US_Customer" stepKey="customer"/>
         </before>
         <after>
@@ -41,9 +37,6 @@
         <comment userInput="Enable multiple wishlist" stepKey="enableMultipleWishlist"/>
         <actionGroup ref="EnableCustomerMultipleWishlistOption" stepKey="enableCustomerWishlist"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
-
-        <!--<amOnPage url="admin/admin/auth/logout/" stepKey="logout"/>-->
-        <!-- Sign in as customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
             <argument name="Customer" value="$$customer$$"/>
         </actionGroup>
@@ -52,12 +45,8 @@
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">
             <argument name="product" value="$$simpleProduct1$$"/>
         </actionGroup>
-        <!--<actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup2" stepKey="addSimpleProduct1ToWishlist">-->
-            <!--<argument name="productVar" value="$$simpleProduct1$$"/>-->
-        <!--</actionGroup>-->
-
         <!-- Add product from first category to the wishlist after shifting-->
-        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup3" stepKey="addSimpleProduct1ToWishlist">
+        <actionGroup ref="StorefrontCustomerAddCategoryProductToWishlistActionGroup2" stepKey="addSimpleProduct1ToWishlist">
             <argument name="productVar" value="$$simpleProduct1$$"/>
         </actionGroup>
           </test>