MAGETWO-59080: Introduce ability return to stock through api for Configurable and Bundle products

Author: Mulderua

app/code/Magento/SalesInventory/Test/Unit/Model/Order/ReturnProcessorTest.php

@@ -34,11 +34,6 @@ class ReturnProcessorTest extends \PHPUnit_Framework_TestCase
      */
     private $creditmemoMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|StockConfigurationInterface
-     */
-    private $stockConfigurationMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|StockManagementInterface
      */
@@ -90,9 +85,6 @@ class ReturnProcessorTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->stockConfigurationMock = $this->getMockBuilder(StockConfigurationInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->stockManagementMock = $this->getMockBuilder(StockManagementInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -132,7 +124,6 @@ public function setUp()
             ->getMock();
 
         $this->returnProcessor = new ReturnProcessor(
-            $this->stockConfigurationMock,
             $this->stockManagementMock,
             $this->stockIndexerProcessorMock,
             $this->priceIndexerMock,
@@ -152,10 +143,6 @@ public function testExecute()
         $storeId = 0;
         $webSiteId = 10;
 
-        $this->stockConfigurationMock->expects($this->once())
-            ->method('isAutoReturnEnabled')
-            ->willReturn(false);
-
         $this->creditmemoMock->expects($this->once())
             ->method('getItems')
             ->willReturn([$this->creditmemoItemMock]);

app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockInvoiceTest.php

@@ -6,6 +6,7 @@
  */
 namespace Magento\SalesInventory\Test\Unit\Model\Plugin\Order;
 
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\SalesInventory\Model\Order\ReturnProcessor;
 use Magento\SalesInventory\Model\Plugin\Order\ReturnToStockInvoice;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
@@ -77,6 +78,11 @@ class ReturnToStockInvoiceTest extends \PHPUnit_Framework_TestCase
      */
     private $extencionAttributesMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|StockConfigurationInterface
+     */
+    private $stockConfigurationMock;
+
     protected function setUp()
     {
         $this->returnProcessorMock = $this->getMockBuilder(ReturnProcessor::class)
@@ -110,12 +116,16 @@ protected function setUp()
         $this->invoiceMock = $this->getMockBuilder(InvoiceInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->stockConfigurationMock = $this->getMockBuilder(StockConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->returnTOStock = new ReturnToStockInvoice(
             $this->returnProcessorMock,
             $this->creditmemoRepositoryMock,
             $this->orderRepositoryMock,
-            $this->invoiceRepositoryMock
+            $this->invoiceRepositoryMock,
+            $this->stockConfigurationMock
         );
     }
 
@@ -157,6 +167,10 @@ public function testAfterExecute()
             ->method('getOrderId')
             ->willReturn($orderId);
 
+        $this->stockConfigurationMock->expects($this->once())
+            ->method('isAutoReturnEnabled')
+            ->willReturn(false);
+
         $this->assertEquals(
             $this->returnTOStock->afterExecute(
                 $this->refundInvoiceMock,

app/code/Magento/SalesInventory/Test/Unit/Model/Plugin/Order/ReturnToStockOrderTest.php

@@ -6,6 +6,7 @@
  */
 namespace Magento\SalesInventory\Test\Unit\Model\Plugin\Order;
 
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\SalesInventory\Model\Order\ReturnProcessor;
 use Magento\SalesInventory\Model\Plugin\Order\ReturnToStockOrder;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
@@ -59,6 +60,11 @@ class ReturnToStockOrderTest extends \PHPUnit_Framework_TestCase
      */
     private $creditmemoMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|StockConfigurationInterface
+     */
+    private $stockConfigurationMock;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|CreditmemoCreationArgumentsInterface
      */
@@ -91,11 +97,15 @@ protected function setUp()
         $this->creditmemoMock = $this->getMockBuilder(CreditmemoInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->stockConfigurationMock = $this->getMockBuilder(StockConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->returnTOStock = new ReturnToStockOrder(
             $this->returnProcessorMock,
             $this->creditmemoRepositoryMock,
-            $this->orderRepositoryMock
+            $this->orderRepositoryMock,
+            $this->stockConfigurationMock
         );
     }
 
@@ -127,6 +137,11 @@ public function testAfterExecute()
             ->method('execute')
             ->with($this->creditmemoMock, $this->orderMock, $returnToStockItems);
 
+
+        $this->stockConfigurationMock->expects($this->once())
+            ->method('isAutoReturnEnabled')
+            ->willReturn(false);
+
         $this->assertEquals(
             $this->returnTOStock->afterExecute(
                 $this->refundOrderMock,