MAGETWO-86938: Product Added to the Wishlist gets deleted if another product from another store is added to the wishlist

Author: le0n4eg

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/ActionGroup/DeleteCustomStoreActionGroup.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="DeleteCustomStoreActionGroup">
+        <arguments>
+            <argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
+        </arguments>
+        <amOnPage stepKey="amOnAdminSystemStorePage"  url="{{AdminSystemStorePage.url}}"/>
+        <click stepKey="resetSearchFilter" selector="{{AdminStoresGridSection.resetButton}}"/>
+        <fillField stepKey="s17" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="{{storeGroupName}}"/>
+        <click stepKey="s19" selector="{{AdminStoresGridSection.searchButton}}"/>
+        <see stepKey="s23" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="{{storeGroupName}}"/>
+        <click stepKey="clickEditExistingStoreRow" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}"/>
+        <click stepKey="clickDeleteStoreGroupButtonOnEditStorePage" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
+        <selectOption stepKey="setCreateDbBackupToNo" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" userInput="No"/>
+        <click stepKey="clickDeleteStoreGroupButtonOnDeleteStorePage" selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}"/>
+    </actionGroup>
+</actionGroups>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresDeleteStoreGroupSection.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<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="AdminStoresDeleteStoreGroupSection">
+        <element name="createDbBackup" type="select" selector="#store_create_backup"/>
+        <element name="deleteStoreGroupButton" type="button" selector="#delete" timeout="30"/>
+    </section>
+</sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Store/Section/AdminStoresMainActionsSection.xml

@@ -12,5 +12,6 @@
         <element name="createWebsiteButton" type="button" selector="#add"/>
         <element name="saveButton" type="button" selector="#save"/>
         <element name="backButton" type="button" selector="#back"/>
+        <element name="deleteButton" type="button" selector="#delete" timeout="30"/>
     </section>
 </sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml

@@ -18,19 +18,21 @@
             <createData stepKey="product" entity="SimpleOne" />
             <createData stepKey="secondProduct" entity="SimpleOne" />
             <createData stepKey="customer" entity="Simple_US_Customer"/>
+            <!-- Create new store view and assign it to non default store -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+            <actionGroup ref="CreateCustomStoreViewActionGroup" stepKey="createCustomStoreView">
+                <argument name="storeGroupName" value="$$storeGroup.group[name]$$"/>
+            </actionGroup>
         </before>
         <after>
             <deleteData stepKey="deleteFirstProduct" createDataKey="product"/>
             <deleteData stepKey="deleteSecondProduct" createDataKey="secondProduct"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-            <deleteData stepKey="deleteStore" createDataKey="storeGroup"/>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStoreGroup">
+                <argument name="storeGroupName" value="$$storeGroup.group[name]$$"/>
+            </actionGroup>
             <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
         </after>
-        <!-- Create new store view and assign it to non default store -->
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
-        <actionGroup ref="CreateCustomStoreViewActionGroup" stepKey="createCustomStoreView">
-            <argument name="storeGroupName" value="$$storeGroup.group[name]$$"/>
-        </actionGroup>
         <!-- Change products visibility on store-view level -->
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProduct1">
             <argument name="product" value="$$product$$"/>