MAGETWO-52042: Saving swatch option cause errors

Author: Yaroslav Onischenko

app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/AddAttribute.php

@@ -7,6 +7,7 @@
 namespace Magento\ConfigurableProduct\Controller\Adminhtml\Product;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\Controller\ResultFactory;
 
 class AddAttribute extends Action
 {
@@ -28,16 +29,11 @@ public function __construct(
     }
 
     /**
-     * Add "super" attribute from popup window
-     *
-     * @return void
+     * @inheritdoc
      */
     public function execute()
     {
         $this->productBuilder->build($this->getRequest());
-        $attributeBlock = $this->_view->getLayout()->createBlock(
-            'Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created'
-        );
-        $this->getResponse()->setBody($attributeBlock->toHtml());
+        return $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
     }
 }

app/code/Magento/ConfigurableProduct/Test/Unit/Controller/Adminhtml/Product/AddAttributeTest.php

@@ -6,10 +6,14 @@
 
 namespace Magento\ConfigurableProduct\Test\Unit\Controller\Adminhtml\Product;
 
+use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 class AddAttributeTest extends \PHPUnit_Framework_TestCase
 {
+    /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
+    private $resultFactory;
+
     /** @var \Magento\ConfigurableProduct\Controller\Adminhtml\Product\AddAttribute */
     protected $controller;
 
@@ -45,35 +49,39 @@ protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
 
-        $this->context = $this->getMockBuilder('\Magento\Backend\App\Action\Context')
+        $this->context = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->request = $this->getMock('Magento\Framework\App\RequestInterface');
+        $this->request = $this->getMock(\Magento\Framework\App\RequestInterface::class);
+        $this->resultFactory = $this->getMock(\Magento\Framework\Controller\ResultFactory::class, [], [], '', false);
         $this->response = $this->getMock(
-            '\Magento\Framework\App\ResponseInterface',
+            \Magento\Framework\App\ResponseInterface::class,
             [
                 'sendResponse',
                 'setBody'
             ]
         );
-        $this->productBuilder = $this->getMockBuilder('\Magento\Catalog\Controller\Adminhtml\Product\Builder')
+        $this->productBuilder = $this->getMockBuilder(\Magento\Catalog\Controller\Adminhtml\Product\Builder::class)
             ->disableOriginalConstructor()
             ->setMethods(['build'])
             ->getMock();
-        $this->view = $this->getMock('\Magento\Framework\App\ViewInterface');
+        $this->view = $this->getMock(\Magento\Framework\App\ViewInterface::class);
 
         $this->context->expects($this->any())
             ->method('getRequest')
             ->will($this->returnValue($this->request));
         $this->context->expects($this->any())
             ->method('getResponse')
             ->will($this->returnValue($this->response));
+        $this->context->expects($this->any())
+            ->method('getResultFactory')
+            ->will($this->returnValue($this->resultFactory));
         $this->context->expects($this->any())
             ->method('getView')
             ->will($this->returnValue($this->view));
 
         $this->controller = $this->objectManagerHelper->getObject(
-            '\Magento\ConfigurableProduct\Controller\Adminhtml\Product\AddAttribute',
+            \Magento\ConfigurableProduct\Controller\Adminhtml\Product\AddAttribute::class,
             [
                 'context' => $this->context,
                 'productBuilder' => $this->productBuilder
@@ -83,22 +91,16 @@ protected function setUp()
 
     public function testExecute()
     {
-        $product = $this->getMockBuilder('\Magento\Catalog\Model\Product')
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
             ->setMethods(['_wakeup', 'getId'])
             ->getMock();
-        $layout = $this->getMock('\Magento\Framework\View\LayoutInterface');
-        $block = $this->getMockBuilder(
-            'Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created'
-        )
-            ->disableOriginalConstructor()
-            ->setMethods(['setIndex', 'toHtml'])
-            ->getMock();
 
         $this->productBuilder->expects($this->once())->method('build')->with($this->request)->willReturn($product);
-        $this->view->expects($this->once())->method('getLayout')->willReturn($layout);
-        $layout->expects($this->once())->method('createBlock')->willReturn($block);
+        $resultLayout = $this->getMock(\Magento\Framework\View\Result\Layout::class, [], [], '', false);
+        $this->resultFactory->expects($this->once())->method('create')->with(ResultFactory::TYPE_LAYOUT)
+            ->willReturn($resultLayout);
 
-        $this->controller->execute();
+        $this->assertInstanceOf(\Magento\Framework\View\Result\Layout::class, $this->controller->execute());
     }
 }

app/code/Magento/ConfigurableProduct/view/adminhtml/layout/catalog_product_addattribute.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
+    <container name="root">
+        <block class="Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created" template="Magento_ConfigurableProduct::catalog/product/attribute/new/created.phtml" as="product.attribute.created" />
+    </container>
+</layout>