Merge branch 'MAGETWO-63190' of github.com:magento-troll/magento2ce into Troll_PR

Author: slopukhov

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/Adminhtml/ProductTest.php

@@ -8,6 +8,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Registry;
 use Magento\TestFramework\ObjectManager;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 
 /**
  * @magentoAppArea adminhtml
@@ -16,13 +17,15 @@ class ProductTest extends \Magento\TestFramework\TestCase\AbstractBackendControl
 {
     /**
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/associated_products.php
      */
     public function testSaveActionAssociatedProductIds()
     {
-        $associatedProductIds = [3, 14, 15, 92];
+        $associatedProductIds = ['3', '14', '15', '92'];
         $associatedProductIdsJSON = json_encode($associatedProductIds);
         $this->getRequest()->setPostValue(
             [
+                'id' => 1,
                 'attributes' => [$this->_getConfigurableAttribute()->getId()],
                 'associated_product_ids_serialized' => $associatedProductIdsJSON,
             ]
@@ -35,8 +38,21 @@ public function testSaveActionAssociatedProductIds()
 
         /** @var $product Product */
         $product = $objectManager->get(Registry::class)->registry('current_product');
+        $configurableProductLinks = array_values($product->getExtensionAttributes()->getConfigurableProductLinks());
+        self::assertEquals(
+            $associatedProductIds,
+            $configurableProductLinks,
+            'Product links are not available in the registry'
+        );
 
-        self::assertEquals($associatedProductIds, $product->getExtensionAttributes()->getConfigurableProductLinks());
+        /** @var $product \Magento\Catalog\Api\Data\ProductInterface */
+        $product = $objectManager->get(ProductRepositoryInterface::class)->getById(1, false, null, true);
+        $configurableProductLinks = array_values($product->getExtensionAttributes()->getConfigurableProductLinks());
+        self::assertEquals(
+            $associatedProductIds,
+            $configurableProductLinks,
+            'Product links are not available in the database'
+        );
     }
 
     /**

dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/associated_products.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\Product::class);
+$product
+    ->setTypeId('simple')
+    ->setId(3)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 3')
+    ->setSku('simple_3')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setQty(22);
+$product = $productRepository->save($product);
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\Product::class);
+$product
+    ->setTypeId('simple')
+    ->setId(14)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 14')
+    ->setSku('simple_14')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setQty(22);
+$product = $productRepository->save($product);
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\Product::class);
+$product
+    ->setTypeId('simple')
+    ->setId(15)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 15')
+    ->setSku('simple_15')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setQty(22);
+$product = $productRepository->save($product);
+
+$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->create(\Magento\Catalog\Model\Product::class);
+$product
+    ->setTypeId('simple')
+    ->setId(92)
+    ->setAttributeSetId(4)
+    ->setWebsiteIds([1])
+    ->setName('Simple Product 92')
+    ->setSku('simple_92')
+    ->setPrice(10)
+    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setQty(22);
+$product = $productRepository->save($product);