Merge remote-tracking branch 'origin/MAGETWO-39108' into BUGS

slavvka · slavvka · commit 002b0dc6d20c · 2015-07-06T18:58:04.000+03:00
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
@@ -94,7 +94,7 @@ public function prepare(Item $item, Object $request, Product $candidate)
         /**
          * We specify qty after we know about parent (for stock)
          */
-        if ($request->getResetCount()) {
+        if ($request->getResetCount() && !$candidate->getStickWithinParent() && $item->getId() == $request->getId()) {
             $item->setData(CartItemInterface::KEY_QTY, 0);
         }
         $item->addQty($candidate->getCartQty());
diff --git a/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/ProcessorTest.php b/app/code/Magento/Quote/Test/Unit/Model/Quote/Item/ProcessorTest.php
@@ -72,7 +72,16 @@ protected function setUp()
 
         $this->itemMock = $this->getMock(
             'Magento\Quote\Model\Quote\Item',
-            ['getId', 'setOptions', '__wakeup', 'setProduct', 'addQty', 'setCustomPrice', 'setOriginalCustomPrice'],
+            [
+                'getId',
+                'setOptions',
+                '__wakeup',
+                'setProduct',
+                'addQty',
+                'setCustomPrice',
+                'setOriginalCustomPrice',
+                'setData'
+            ],
             [],
             '',
             false
@@ -109,7 +118,7 @@ protected function setUp()
 
         $this->productMock = $this->getMock(
             'Magento\Catalog\Model\Product',
-            ['getCustomOptions', '__wakeup', 'getParentProductId', 'getCartQty'],
+            ['getCustomOptions', '__wakeup', 'getParentProductId', 'getCartQty', 'getStickWithinParent'],
             [],
             '',
             false
@@ -148,8 +157,12 @@ public function testInitWithQtyModification()
             ->will($this->returnValue($itemId));
         $this->itemMock->expects($this->any())
             ->method('setData')
-            ->with($this->equalTo('qty'), $this->equalTo(0));
-
+            ->willReturnMap(
+                [
+                    ['store_id', $storeId],
+                    ['qty', 0],
+                ]
+            );
 
         $this->storeMock->expects($this->any())
             ->method('getId')
@@ -177,15 +190,20 @@ public function testInitWithoutModification()
             ->method('getParentProductId')
             ->will($this->returnValue(true));
 
-
         $this->itemMock->expects($this->never())->method('setOptions');
         $this->itemMock->expects($this->never())->method('setProduct');
 
         $this->itemMock->expects($this->any())
             ->method('getId')
             ->will($this->returnValue($itemId));
 
-        $this->itemMock->expects($this->never())->method('setData');
+        $this->itemMock->expects($this->any())
+            ->method('setData')
+            ->willReturnMap(
+                [
+                    ['store_id', $storeId],
+                ]
+            );
 
         $this->storeMock->expects($this->any())
             ->method('getId')
@@ -222,7 +240,13 @@ public function testInitWithoutModificationAdminhtmlAreaCode()
             ->method('getId')
             ->will($this->returnValue($itemId));
 
-        $this->itemMock->expects($this->never())->method('setData');
+        $this->itemMock->expects($this->any())
+            ->method('setData')
+            ->willReturnMap(
+                [
+                    ['store_id', $storeId],
+                ]
+            );
 
         $this->storeMock->expects($this->any())
             ->method('getId')
@@ -238,58 +262,171 @@ public function testPrepare()
     {
         $qty = 3000000000;
         $customPrice = 400000000;
+        $itemId = 1;
+        $requestItemId = 1;
 
         $this->productMock->expects($this->any())
             ->method('getCartQty')
             ->will($this->returnValue($qty));
+        $this->productMock->expects($this->any())
+            ->method('getStickWithinParent')
+            ->will($this->returnValue(false));
 
-        $this->itemMock->expects($this->any())
+        $this->itemMock->expects($this->once())
             ->method('addQty')
             ->with($qty);
+        $this->itemMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($itemId));
+        $this->itemMock->expects($this->never())
+            ->method('setData');
 
         $this->objectMock->expects($this->any())
             ->method('getCustomPrice')
             ->will($this->returnValue($customPrice));
+        $this->objectMock->expects($this->any())
+            ->method('getResetCount')
+            ->will($this->returnValue(false));
+        $this->objectMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($requestItemId));
+
+        $this->itemMock->expects($this->once())
+            ->method('setCustomPrice')
+            ->will($this->returnValue($customPrice));
+        $this->itemMock->expects($this->once())
+            ->method('setOriginalCustomPrice')
+            ->will($this->returnValue($customPrice));
 
+        $this->processor->prepare($this->itemMock, $this->objectMock, $this->productMock);
+    }
+
+    public function testPrepareWithResetCountAndStick()
+    {
+        $qty = 3000000000;
+        $customPrice = 400000000;
+        $itemId = 1;
+        $requestItemId = 1;
+
+        $this->productMock->expects($this->any())
+            ->method('getCartQty')
+            ->will($this->returnValue($qty));
+        $this->productMock->expects($this->any())
+            ->method('getStickWithinParent')
+            ->will($this->returnValue(true));
+
+        $this->itemMock->expects($this->once())
+            ->method('addQty')
+            ->with($qty);
         $this->itemMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($itemId));
+        $this->itemMock->expects($this->never())
+            ->method('setData');
+
+        $this->objectMock->expects($this->any())
+            ->method('getCustomPrice')
+            ->will($this->returnValue($customPrice));
+        $this->objectMock->expects($this->any())
+            ->method('getResetCount')
+            ->will($this->returnValue(true));
+        $this->objectMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($requestItemId));
+
+        $this->itemMock->expects($this->once())
             ->method('setCustomPrice')
             ->will($this->returnValue($customPrice));
+        $this->itemMock->expects($this->once())
+            ->method('setOriginalCustomPrice')
+            ->will($this->returnValue($customPrice));
+
+        $this->processor->prepare($this->itemMock, $this->objectMock, $this->productMock);
+    }
+
+    public function testPrepareWithResetCountAndNotStickAndOtherItemId()
+    {
+        $qty = 3000000000;
+        $customPrice = 400000000;
+        $itemId = 1;
+        $requestItemId = 2;
+
+        $this->productMock->expects($this->any())
+            ->method('getCartQty')
+            ->will($this->returnValue($qty));
+        $this->productMock->expects($this->any())
+            ->method('getStickWithinParent')
+            ->will($this->returnValue(false));
+
+        $this->itemMock->expects($this->once())
+            ->method('addQty')
+            ->with($qty);
         $this->itemMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($itemId));
+        $this->itemMock->expects($this->never())
+            ->method('setData');
+
+        $this->objectMock->expects($this->any())
+            ->method('getCustomPrice')
+            ->will($this->returnValue($customPrice));
+        $this->objectMock->expects($this->any())
+            ->method('getResetCount')
+            ->will($this->returnValue(true));
+        $this->objectMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($requestItemId));
+
+        $this->itemMock->expects($this->once())
+            ->method('setCustomPrice')
+            ->will($this->returnValue($customPrice));
+        $this->itemMock->expects($this->once())
             ->method('setOriginalCustomPrice')
             ->will($this->returnValue($customPrice));
 
         $this->processor->prepare($this->itemMock, $this->objectMock, $this->productMock);
     }
 
-    public function testPrepareResetCount()
+    public function testPrepareWithResetCountAndNotStickAndSameItemId()
     {
         $qty = 3000000000;
         $customPrice = 400000000;
+        $itemId = 1;
+        $requestItemId = 1;
 
         $this->objectMock->expects($this->any())
             ->method('getResetCount')
             ->will($this->returnValue(true));
 
         $this->itemMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($itemId));
+        $this->itemMock->expects($this->once())
             ->method('setData')
             ->with(CartItemInterface::KEY_QTY, 0);
 
         $this->productMock->expects($this->any())
             ->method('getCartQty')
             ->will($this->returnValue($qty));
+        $this->productMock->expects($this->any())
+            ->method('getStickWithinParent')
+            ->will($this->returnValue(false));
 
-        $this->itemMock->expects($this->any())
+        $this->itemMock->expects($this->once())
             ->method('addQty')
             ->with($qty);
 
         $this->objectMock->expects($this->any())
             ->method('getCustomPrice')
             ->will($this->returnValue($customPrice));
+        $this->objectMock->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($requestItemId));
 
-        $this->itemMock->expects($this->any())
+        $this->itemMock->expects($this->once())
             ->method('setCustomPrice')
             ->will($this->returnValue($customPrice));
-        $this->itemMock->expects($this->any())
+        $this->itemMock->expects($this->once())
             ->method('setOriginalCustomPrice')
             ->will($this->returnValue($customPrice));
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public function prepare(Item $item, Object $request, Product $candidate)`
`94`	`94`	`/**`
`95`	`95`	`* We specify qty after we know about parent (for stock)`
`96`	`96`	`*/`
`97`		`- if ($request->getResetCount()) {`
	`97`	`+ if ($request->getResetCount() && !$candidate->getStickWithinParent() && $item->getId() == $request->getId()) {`
`98`	`98`	`$item->setData(CartItemInterface::KEY_QTY, 0);`
`99`	`99`	`}`
`100`	`100`	`$item->addQty($candidate->getCartQty());`