MAGETWO-35175: Impossible to create Configurable product

Author: orlangur

app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php

@@ -90,7 +90,7 @@ public function execute()
             if ($storeId) {
                 $product->setStoreId($storeId);
             }
-            $setId = $this->getRequest()->getPost('set');
+            $setId = $this->getRequest()->getPost('set') ?: $this->getRequest()->getParam('set');
             if ($setId) {
                 $product->setAttributeSetId($setId);
             }

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ValidateTest.php

@@ -28,9 +28,9 @@ class ValidateTest extends \Magento\Catalog\Test\Unit\Controller\Adminhtml\Produ
     protected $initializationHelper;
     /** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $productFactory;
-    /** @var \Magento\Framework\Controller\Result\JSON|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Controller\Result\Json|\PHPUnit_Framework_MockObject_MockObject */
     protected $resultJson;
-    /** @var \Magento\Framework\Controller\Result\JSONFactory|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\Controller\Result\JsonFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $resultJsonFactory;
 
     protected function setUp()
@@ -104,8 +104,8 @@ protected function setUp()
             ->getMock();
         $this->productFactory->expects($this->any())->method('create')->willReturn($this->product);
 
-        $this->resultJson = $this->getMock('Magento\Framework\Controller\Result\JSON', [], [], '', false);
-        $this->resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JSONFactory')
+        $this->resultJson = $this->getMock('Magento\Framework\Controller\Result\Json', [], [], '', false);
+        $this->resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -126,15 +126,21 @@ protected function setUp()
         );
     }
 
-    /**
-     * @return void
-     */
-    public function testAttributeSetIsObtainedFromPost()
+    public function testAttributeSetIsObtainedFromPostByDefault()
     {
+        $this->request->expects($this->any())->method('getParam')->willReturnMap([['set', null, 4]]);
         $this->request->expects($this->any())->method('getPost')->willReturnMap([['set', null, 9]]);
-
         $this->product->expects($this->once())->method('setAttributeSetId')->with(9);
 
         $this->action->execute();
     }
+
+    public function testAttributeSetIsObtainedFromGetWhenThereIsNoOneInPost()
+    {
+        $this->request->expects($this->any())->method('getParam')->willReturnMap([['set', null, 4]]);
+        $this->request->expects($this->any())->method('getPost')->willReturnMap([['set', null, null]]);
+        $this->product->expects($this->once())->method('setAttributeSetId')->with(4);
+
+        $this->action->execute();
+    }
 }

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

@@ -40,7 +40,7 @@ class CreateConfigurableProductEntityTest extends Injectable
 {
     /* tags */
     const TEST_TYPE = 'acceptance_test';
-    const STABLE = 'no';
+    const STABLE = 'yes';
     const MVP = 'yes';
     const DOMAIN = 'MX';
     /* end tags */

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

@@ -9,7 +9,6 @@
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\ConfigurableProduct\Test\TestCase\CreateConfigurableProductEntityTest">
         <variation name="CreateConfigurableProductEntityTestVariation1">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-34195</data>
             <data name="description" xsi:type="string">Create product with category and two new options</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/preset" xsi:type="string">two_new_options</data>
@@ -55,7 +54,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCart"/>
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation3">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-34195</data>
             <data name="description" xsi:type="string">Create product with special price</data>
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/preset" xsi:type="string">two_new_options</data>
@@ -116,7 +114,6 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductPage" />
         </variation>
         <variation name="CreateConfigurableProductEntityTestVariation6" firstConstraint="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" method="test">
-            <data name="issue" xsi:type="string">Bug: MAGETWO-34195</data>
             <data name="description" xsi:type="string">MAGETWO-13361: Create Configurable Product with Creating New Category and New Attribute (Required Fields Only)</data>
             <data name="product/data/configurable_attributes_data/preset" xsi:type="string">two_searchable_options</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>