Merge branch 'MAGETWO-64547' of github.com:magento-firedrakes/magento2ce into MAGETWO-64547

valdislav · valdislav · commit f6c3516b699e · 2017-06-13T15:11:14.000+03:00
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php b/app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
@@ -406,9 +406,13 @@ public function testAddChildLinkedProductIsComposite()
      */
     public function testAddChildProductAlreadyExistsInOption()
     {
-        $productLink = $this->getMock(\Magento\Bundle\Api\Data\LinkInterface::class);
+        $productLink = $this->getMockBuilder(\Magento\Bundle\Api\Data\LinkInterface::class)
+            ->setMethods(['getSku', 'getOptionId', 'getSelectionId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $productLink->expects($this->any())->method('getSku')->will($this->returnValue('linked_product_sku'));
         $productLink->expects($this->any())->method('getOptionId')->will($this->returnValue(1));
+        $productLink->expects($this->any())->method('getSelectionId')->will($this->returnValue(1));
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
@@ -458,8 +462,8 @@ public function testAddChildProductAlreadyExistsInOption()
         );
 
         $selections = [
-            ['option_id' => 1, 'product_id' => 12],
-            ['option_id' => 1, 'product_id' => 13],
+            ['option_id' => 1, 'product_id' => 12, 'parent_product_id' => 'product_id'],
+            ['option_id' => 1, 'product_id' => 13, 'parent_product_id' => 'product_id'],
         ];
         $bundle = $this->getMock(\Magento\Bundle\Model\ResourceModel\Bundle::class, [], [], '', false);
         $bundle->expects($this->once())->method('getSelectionsData')
@@ -474,9 +478,13 @@ public function testAddChildProductAlreadyExistsInOption()
      */
     public function testAddChildCouldNotSave()
     {
-        $productLink = $this->getMock(\Magento\Bundle\Api\Data\LinkInterface::class);
+        $productLink = $this->getMockBuilder(\Magento\Bundle\Api\Data\LinkInterface::class)
+            ->setMethods(['getSku', 'getOptionId', 'getSelectionId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $productLink->expects($this->any())->method('getSku')->will($this->returnValue('linked_product_sku'));
         $productLink->expects($this->any())->method('getOptionId')->will($this->returnValue(1));
+        $productLink->expects($this->any())->method('getSelectionId')->will($this->returnValue(1));
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
@@ -545,9 +553,13 @@ function () {
 
     public function testAddChild()
     {
-        $productLink = $this->getMock(\Magento\Bundle\Api\Data\LinkInterface::class);
+        $productLink = $this->getMockBuilder(\Magento\Bundle\Api\Data\LinkInterface::class)
+            ->setMethods(['getSku', 'getOptionId', 'getSelectionId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $productLink->expects($this->any())->method('getSku')->will($this->returnValue('linked_product_sku'));
         $productLink->expects($this->any())->method('getOptionId')->will($this->returnValue(1));
+        $productLink->expects($this->any())->method('getSelectionId')->will($this->returnValue(1));
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
@@ -623,7 +635,10 @@ public function testSaveChild()
         $parentProductId = 32;
         $bundleProductSku = 'bundleProductSku';
 
-        $productLink = $this->getMock(\Magento\Bundle\Api\Data\LinkInterface::class);
+        $productLink = $this->getMockBuilder(\Magento\Bundle\Api\Data\LinkInterface::class)
+            ->setMethods(['getSku', 'getOptionId', 'getSelectionId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $productLink->expects($this->any())->method('getSku')->will($this->returnValue('linked_product_sku'));
         $productLink->expects($this->any())->method('getId')->will($this->returnValue($id));
         $productLink->expects($this->any())->method('getOptionId')->will($this->returnValue($optionId));
@@ -633,6 +648,7 @@ public function testSaveChild()
         $productLink->expects($this->any())->method('getPrice')->will($this->returnValue($price));
         $productLink->expects($this->any())->method('getCanChangeQuantity')->will($this->returnValue($canChangeQuantity));
         $productLink->expects($this->any())->method('getIsDefault')->will($this->returnValue($isDefault));
+        $productLink->expects($this->any())->method('getSelectionId')->will($this->returnValue($optionId));
 
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn($this->linkField);
         $productMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
@@ -707,9 +723,13 @@ public function testSaveChildFailedToSave()
         $id = 12;
         $linkProductId = 45;
         $parentProductId = 32;
-        $productLink = $this->getMock(\Magento\Bundle\Api\Data\LinkInterface::class);
+        $productLink = $this->getMockBuilder(\Magento\Bundle\Api\Data\LinkInterface::class)
+            ->setMethods(['getSku', 'getOptionId', 'getSelectionId'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
         $productLink->expects($this->any())->method('getSku')->will($this->returnValue('linked_product_sku'));
         $productLink->expects($this->any())->method('getId')->will($this->returnValue($id));
+        $productLink->expects($this->any())->method('getSelectionId')->will($this->returnValue(1));
         $bundleProductSku = 'bundleProductSku';
 
         $productMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php b/app/code/Magento/Bundle/Test/Unit/Model/OptionRepositoryTest.php
@@ -313,14 +313,20 @@ public function testSaveExistingOption()
         $productMock = $this->getMock(\Magento\Catalog\Model\Product::class, [], [], '', false);
         $productMock->expects($this->once())->method('getData')->willReturn($productId);
         $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
+        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->typeMock->expects($this->once())
+            ->method('getOptionsCollection')
+            ->with($productMock)
+            ->willReturn($optionCollectionMock);
+        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+
+        $optionMock = $this->getMockBuilder(\Magento\Bundle\Model\Option::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
 
-        $optionMock = $this->getMock(
-            \Magento\Bundle\Model\Option::class,
-            ['setStoreId', 'setParentId', 'getProductLinks', 'getOptionId', 'getResource'],
-            [],
-            '',
-            false
-        );
         $metadataMock = $this->getMock(
             \Magento\Framework\EntityManager\EntityMetadata::class,
             [],
@@ -329,7 +335,6 @@ public function testSaveExistingOption()
             false
         );
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
-        $optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
 
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')
             ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
@@ -362,22 +367,19 @@ public function testSaveNewOption()
         $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
         $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
 
-        $optionMock = $this->getMock(
-            \Magento\Bundle\Model\Option::class,
-            [
-                'setStoreId',
-                'setParentId',
-                'getProductLinks',
-                'getOptionId',
-                'setOptionId',
-                'setDefaultTitle',
-                'getTitle',
-                'getResource'
-            ],
-            [],
-            '',
-            false
-        );
+        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->typeMock->expects($this->once())
+            ->method('getOptionsCollection')
+            ->with($productMock)
+            ->willReturn($optionCollectionMock);
+        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+
+        $optionMock = $this->getMockBuilder(\Magento\Bundle\Model\Option::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
         $metadataMock = $this->getMock(
             \Magento\Framework\EntityManager\EntityMetadata::class,
             [],
@@ -386,7 +388,6 @@ public function testSaveNewOption()
             false
         );
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
-        $optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
 
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')
             ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
@@ -426,22 +427,19 @@ public function testSaveCanNotSave()
         $productMock->expects($this->once())->method('getStoreId')->willReturn($storeId);
         $productMock->expects($this->any())->method('getSku')->willReturn($productSku);
 
-        $optionMock = $this->getMock(
-            \Magento\Bundle\Model\Option::class,
-            [
-                'setStoreId',
-                'setParentId',
-                'getProductLinks',
-                'getOptionId',
-                'setOptionId',
-                'setDefaultTitle',
-                'getTitle',
-                'getResource'
-            ],
-            [],
-            '',
-            false
-        );
+        $optionCollectionMock = $this->getMockBuilder(\Magento\Bundle\Model\ResourceModel\Option\Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->typeMock->expects($this->once())
+            ->method('getOptionsCollection')
+            ->with($productMock)
+            ->willReturn($optionCollectionMock);
+        $optionCollectionMock->expects($this->once())->method('setIdFilter')->with($optionId)->willReturnSelf();
+
+        $optionMock = $this->getMockBuilder(\Magento\Bundle\Model\Option::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $optionCollectionMock->expects($this->once())->method('getFirstItem')->willReturn($optionMock);
         $metadataMock = $this->getMock(
             \Magento\Framework\EntityManager\EntityMetadata::class,
             [],
@@ -450,13 +448,11 @@ public function testSaveCanNotSave()
             false
         );
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn('product_option');
-        $optionMock->expects($this->once())->method('setParentId')->with($productId)->willReturnSelf();
 
         $this->metadataPoolMock->expects($this->once())->method('getMetadata')
             ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
             ->willReturn($metadataMock);
-        $optionMock->method('getOptionId')
-            ->will($this->onConsecutiveCalls(null, null, $optionId, $optionId, $optionId));
+        $optionMock->method('getOptionId')->willReturn($optionId);
 
         $productLink1 = $this->getMock(\Magento\Bundle\Api\Data\LinkInterface::class);
         $productLink2 = $this->getMock(\Magento\Bundle\Api\Data\LinkInterface::class);
