MAGETWO-36224: Success message is absent while adding product with options from wishlist to shopping cart

Author: Sergey Semenov

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

@@ -76,6 +76,10 @@ class Cart extends Action\Action implements IndexInterface
      * @param \Magento\Catalog\Helper\Product $productHelper
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Wishlist\Helper\Data $helper
+     * @param \Magento\Checkout\Helper\Cart $cartHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Action\Context $context,

app/code/Magento/Wishlist/Test/Unit/Controller/Index/CartTest.php

@@ -154,7 +154,7 @@ protected function setUp()
 
         $this->responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
             ->disableOriginalConstructor()
-            ->setMethods(['setRedirect'])
+            ->setMethods(['setRedirect', 'representJson'])
             ->getMockForAbstractClass();
 
         $this->redirectMock = $this->getMockBuilder('Magento\Framework\App\Response\RedirectInterface')
@@ -295,9 +295,13 @@ public function testExecuteWithNoWishlist()
     }
 
     /**
+     * @param bool $isAjax
+     *
+     * @dataProvider dataProviderExecuteWithQuantityArray
+     *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testExecuteWithQuantityArray()
+    public function testExecuteWithQuantityArray($isAjax)
     {
         $itemId = 2;
         $wishlistId = 1;
@@ -419,7 +423,7 @@ public function testExecuteWithQuantityArray()
             ->willReturn($params);
         $this->requestMock->expects($this->once())
             ->method('isAjax')
-            ->willReturn(false);
+            ->willReturn($isAjax);
 
         $buyRequestMock = $this->getMockBuilder('Magento\Framework\Object')
             ->disableOriginalConstructor()
@@ -502,12 +506,33 @@ public function testExecuteWithQuantityArray()
             ->method('calculate')
             ->willReturnSelf();
 
-        $this->responseMock->expects($this->once())
+        $this->jsonHelperMock->expects($this->any())
+            ->method('jsonEncode')
+            ->with(['backUrl' => $refererUrl])
+            ->willReturn('{"backUrl":"' . $refererUrl . '"}');
+
+        $this->responseMock->expects($this->any())
             ->method('setRedirect')
             ->with($refererUrl)
             ->willReturn($this->responseMock);
+        $this->responseMock->expects($this->any())
+            ->method('representJson')
+            ->with('{"backUrl":"' . $refererUrl . '"}')
+            ->willReturnSelf();
 
-        $this->assertEquals($this->responseMock, $this->model->execute());
+        $expectedResult = ($isAjax ? null : $this->responseMock);
+        $this->assertEquals($expectedResult, $this->model->execute());
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderExecuteWithQuantityArray()
+    {
+        return [
+            ['isAjax' => false],
+            ['isAjax' => true],
+        ];
     }
 
     /**