Merge remote-tracking branch 'origin/MAGETWO-52042' into develop

Author: Yaroslav Onischenko

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

@@ -34,12 +34,10 @@ public function __construct(
      */
     public function execute()
     {
-        $this->_view->loadLayout('popup');
         $this->productBuilder->build($this->getRequest());
         $attributeBlock = $this->_view->getLayout()->createBlock(
             'Magento\ConfigurableProduct\Block\Adminhtml\Product\Attribute\NewAttribute\Product\Created'
         );
-        $this->_addContent($attributeBlock);
-        $this->_view->renderLayout();
+        $this->getResponse()->setBody($attributeBlock->toHtml());
     }
 }

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

@@ -95,12 +95,9 @@ public function testExecute()
             ->setMethods(['setIndex', 'toHtml'])
             ->getMock();
 
-        $this->view->expects($this->once())->method('loadLayout')->with('popup')->willReturnSelf();
         $this->productBuilder->expects($this->once())->method('build')->with($this->request)->willReturn($product);
-        $this->view->expects($this->any())->method('getLayout')->willReturn($layout);
+        $this->view->expects($this->once())->method('getLayout')->willReturn($layout);
         $layout->expects($this->once())->method('createBlock')->willReturn($block);
-        $layout->expects($this->once())->method('setChild')->willReturnSelf();
-        $this->view->expects($this->any())->method('renderLayout')->willReturnSelf();
 
         $this->controller->execute();
     }

app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/attribute/new/created.phtml

@@ -18,7 +18,4 @@
     $('#create_new_attribute').modal('closeModal');
 
 })(window.parent.jQuery);
-</script>
-<div class="a-center">
-    <?php echo $block->getCloseButtonHtml() ?>
-</div>
+</script>