MC-40417: Unexpected behavior when updating a Product with a Customizable Option (File) in the Wish List

Author: OlgaVasyltsun

app/code/Magento/Wishlist/Controller/Index/Add.php

@@ -12,6 +12,9 @@
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\App\Response\RedirectInterface;
 
 /**
  * Wish list Add controller
@@ -40,31 +43,39 @@ class Add extends \Magento\Wishlist\Controller\AbstractIndex implements HttpPost
      */
     protected $formKeyValidator;
 
+    private $redirect;
+
+    private $urlBuilder;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
      * @param ProductRepositoryInterface $productRepository
      * @param Validator $formKeyValidator
+     * @param RedirectInterface $redirect
+     * @param UrlInterface $urlBuilder
      */
     public function __construct(
         Action\Context $context,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider,
         ProductRepositoryInterface $productRepository,
-        Validator $formKeyValidator
+        Validator $formKeyValidator,
+        RedirectInterface $redirect = null,
+        UrlInterface $urlBuilder = null
     ) {
         $this->_customerSession = $customerSession;
         $this->wishlistProvider = $wishlistProvider;
         $this->productRepository = $productRepository;
         $this->formKeyValidator = $formKeyValidator;
+        $this->redirect = $redirect ?: ObjectManager::getInstance()->get(RedirectInterface::class);
+        $this->urlBuilder = $urlBuilder ?: ObjectManager::getInstance()->get(UrlInterface::class);
         parent::__construct($context);
     }
 
     /**
-     * Adding new item
-     *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect|\Magento\Framework\Controller\ResultInterface
      * @throws NotFoundException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -153,7 +164,16 @@ public function execute()
             );
         }
 
+        if ($this->getRequest()->isAjax()) {
+            $url = $this->urlBuilder->getUrl('*', $this->redirect->updatePathParams(['wishlist_id' => $wishlist->getId()]));
+            /** @var Json $resultJson */
+            $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+            $resultJson->setData(['backUrl' => $url]);
+
+            return $resultJson;
+        }
         $resultRedirect->setPath('*', ['wishlist_id' => $wishlist->getId()]);
+
         return $resultRedirect;
     }
 }

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

@@ -0,0 +1,20 @@
+<?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="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontCustomerUpdateProductInWishlistActionGroup" extends="StorefrontCustomerAddProductToWishlistActionGroup">
+        <annotations>
+            <description>Updates the provided Product to the Wish List from the Storefront Product page. Validates that the Success Message is present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been updated in your Wish List." stepKey="addProductToWishlistSeeProductNameAddedToWishlist"/>
+    </actionGroup>
+</actionGroups>

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

@@ -18,7 +18,6 @@
             <group value="wishlist"/>
         </annotations>
         <before>
-            <!-- Create Data -->
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="SimpleProduct2" stepKey="createProduct">
@@ -29,14 +28,13 @@
             </updateData>
         </before>
         <after>
-            <!-- Delete data -->
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct1"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
-        <!-- 1. Login as a customer -->
+        <!-- Login as a customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
             <argument name="Customer" value="$createCustomer$"/>
         </actionGroup>
@@ -48,26 +46,25 @@
         <attachFile userInput="adobe-base.jpg" selector="{{StorefrontProductInfoMainSection.addLinkFileUploadFile(ProductOptionFile.title)}}" stepKey="fillUploadFile"/>
 
         <!-- Add product to the wishlist -->
-        <click selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="addProductToWishlistClickAddToWishlist"/>
-        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage"/>
-        <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="amOnWishListPage"/>
-        <waitForPageLoad stepKey="waitForWishlistPageLoad"/>
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addProductWithOptionToWishlist">
+            <argument name="productVar" value="$createProduct$"/>
+        </actionGroup>
 
         <!-- Assert product is present in wishlist -->
         <actionGroup ref="AssertProductIsPresentInWishListActionGroup" stepKey="assertProductPresent">
             <argument name="productName" value="$createProduct.name$"/>
             <argument name="productPrice" value="$109.99"/>
         </actionGroup>
 
+        <!-- Edit wishlist product -->
         <actionGroup ref="StorefrontCustomerUpdateWishlistItemActionGroup" stepKey="clickEditWishlistItem">
             <argument name="productName" value="$createProduct.name$"/>
         </actionGroup>
 
-        <click selector="{{StorefrontProductInfoMainSection.productAddToWishlist}}" stepKey="addProductToWishlistClickAddToWishlist2"/>
-        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage2"/>
-
-        <amOnPage url="{{StorefrontCustomerWishlistPage.url}}" stepKey="amOnWishListPage2"/>
-        <waitForPageLoad stepKey="waitForWishlistPageLoad2"/>
+        <!-- Update product in wishlist from product page -->
+        <actionGroup ref="StorefrontCustomerUpdateProductInWishlistActionGroup" stepKey="updateProductWithOptionInWishlist">
+            <argument name="productVar" value="$createProduct$"/>
+        </actionGroup>
 
         <actionGroup ref="AssertProductIsPresentInWishListActionGroup" stepKey="assertProductPresent2">
             <argument name="productName" value="$createProduct.name$"/>