Merge branch 'MAGETWO-60742' into 2.1.8-develop-pr7

Author: zakdma

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Configurable.php

@@ -95,7 +95,7 @@ public function afterInitialize(Helper $subject, ProductInterface $product)
             $product->setAttributeSetId($setId);
         }
         $extensionAttributes = $product->getExtensionAttributes();
-
+        $product->getResource()->getSortedAttributes($setId);
         $product->setNewVariationsAttributeSetId($setId);
 
         $configurableOptions = [];

app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/ConfigurableTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\ConfigurableProduct\Controller\Adminhtml\Product\Initialization\Helper\Plugin\Configurable;
 use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable as ConfigurableProduct;
@@ -74,7 +75,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods([
                 'getTypeId', 'setAttributeSetId', 'getExtensionAttributes', 'setNewVariationsAttributeSetId',
-                'setCanSaveConfigurableAttributes', 'setExtensionAttributes', 'hasData', 'getData'
+                'setCanSaveConfigurableAttributes', 'setExtensionAttributes', 'hasData', 'getData', 'getResource'
             ])
             ->getMock();
 
@@ -94,6 +95,9 @@ protected function setUp()
      */
     public function testAfterInitializeWithAttributesAndVariations()
     {
+        $postValue = 24;
+        $productResourceMock = $this->getProductResource($postValue);
+
         $attributes = [
             ['attribute_id' => 90, 'values' => [
                 ['value_index' => 12], ['value_index' => 13]
@@ -152,7 +156,7 @@ public function testAfterInitializeWithAttributesAndVariations()
             'configurable-matrix' => $simpleProducts
         ];
         $valueMap = [
-            ['new-variations-attribute-set-id', null, 24],
+            ['new-variations-attribute-set-id', null, $postValue],
             ['product', [], $productData]
         ];
 
@@ -164,20 +168,24 @@ public function testAfterInitializeWithAttributesAndVariations()
             ->method('getTypeId')
             ->willReturn(ConfigurableProduct::TYPE_CODE);
 
-        $this->product->expects(static::at(4))
+        $this->product->expects(static::at(5))
             ->method('hasData')
             ->with('associated_product_ids')
             ->willReturn(false);
-        $this->product->expects(static::at(5))
+        $this->product->expects(static::at(6))
             ->method('hasData')
             ->with('configurable-matrix')
             ->willReturn(true);
 
-        $this->product->expects(static::at(6))
+        $this->product->expects(static::at(7))
             ->method('getData')
             ->with('configurable-matrix')
             ->willReturn($simpleProducts);
 
+        $this->product->expects(static::once())
+            ->method('getResource')
+            ->willReturn($productResourceMock);
+
         $this->request->expects(static::any())
             ->method('getPost')
             ->willReturnMap($valueMap);
@@ -225,6 +233,9 @@ public function testAfterInitializeWithAttributesAndVariations()
 
     public function testAfterInitializeWithAttributesAndWithoutVariations()
     {
+        $postValue = 24;
+        $productResourceMock = $this->getProductResource($postValue);
+
         $attributes = [
             ['attribute_id' => 90, 'values' => [
                 ['value_index' => 12], ['value_index' => 13]
@@ -238,7 +249,7 @@ public function testAfterInitializeWithAttributesAndWithoutVariations()
         ];
 
         $valueMap = [
-            ['new-variations-attribute-set-id', null, 24],
+            ['new-variations-attribute-set-id', null, $postValue],
             ['product', [], $productData],
         ];
         $paramValueMap = [
@@ -254,6 +265,9 @@ public function testAfterInitializeWithAttributesAndWithoutVariations()
         $this->product->expects(static::at(0))
             ->method('getData')
             ->willReturn(ConfigurableProduct::TYPE_CODE);
+        $this->product->expects(static::once())
+            ->method('getResource')
+            ->willReturn($productResourceMock);
 
         $this->request->expects(static::any())
             ->method('getPost')
@@ -331,4 +345,21 @@ public function testAfterInitializeForNotConfigurableProduct()
             ->method('generateSimpleProducts');
         $this->plugin->afterInitialize($this->subject, $this->product);
     }
+
+    /**
+     * generate product resource model mock
+     * @param $postValue
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getProductResource($postValue)
+    {
+        $productResourceMock = $this->getMockBuilder(ProductResource::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $productResourceMock->expects(static::once())
+            ->method('getSortedAttributes')
+            ->with($postValue);
+
+        return $productResourceMock;
+    }
 }

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductForm.php

@@ -60,6 +60,7 @@ class AssertConfigurableProductForm extends AssertProductForm
      */
     protected $skippedVariationMatrixFields = [
         'configurable_attribute',
+        'special_price'
     ];
 
     /**

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php

@@ -129,6 +129,9 @@ protected function getLowestConfigurablePrice()
             if ($price > $option['price']) {
                 $price = $option['price'];
             }
+            if (isset($option['special_price']) && $price > $option['special_price']) {
+                $price = $option['special_price'];
+            }
         }
 
         return $price;

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct/ConfigurableAttributesData.php

@@ -292,7 +292,8 @@ protected function prepareVariationsMatrix(array $data)
                     'sku' => $product->getSku(),
                     'qty' => $quantityAndStockStatus['qty'],
                     'weight' => $product->getWeight(),
-                    'price' => $product->getPrice()
+                    'price' => $product->getPrice(),
+                    'special_price' => $product->getSpecialPrice()
                 ];
                 $this->variationsMatrix[$key] = array_replace_recursive($this->variationsMatrix[$key], $productData);
             } else {
@@ -381,6 +382,7 @@ protected function prepareData()
             'price',
             'qty',
             'weight',
+            'special_price'
         ];
 
         $this->data = [

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml

@@ -54,7 +54,7 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCart" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation3" summary="Create product with special price">
-            <data name="tag" xsi:type="string">to_maintain:yes</data>
+            <data name="tag" xsi:type="string">to_maintain:no</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">two_options_with_assigned_product_special_price</data>
             <data name="product/data/checkout_data/dataset" xsi:type="string">configurable_two_new_options_with_special_price</data>