Merge remote-tracking branch 'tango-ce/MAGETWO-52343' into MAGETWO-52779

Author: magicbunneh

lib/internal/Magento/Framework/View/Layout/Generator/Container.php

@@ -84,12 +84,6 @@ public function generateContainer(
         $elementName,
         $options
     ) {
-        $structure->setAttribute(
-            $elementName,
-            Layout\Element::CONTAINER_OPT_LABEL,
-            $options[Layout\Element::CONTAINER_OPT_LABEL]
-        );
-        unset($options[Layout\Element::CONTAINER_OPT_LABEL]);
         unset($options['type']);
 
         $this->validateOptions($options);

lib/internal/Magento/Framework/View/Test/Unit/Layout/Generator/ContainerTest.php

@@ -116,6 +116,26 @@ public function processDataProvider()
                     ['first_container', Container::CONTAINER_OPT_HTML_ID, 'dd_id'],
                 ],
                 'setAttributeCalls' => 4,
+            ],
+            'sample_data2' => [
+                'structureElements' => [
+                    'first_container' => [
+                        'container',
+                        [
+                            'attributes' => [
+                                Container::CONTAINER_OPT_HTML_TAG   => 'dd',
+                                Container::CONTAINER_OPT_HTML_CLASS => 'dd_class',
+                                Container::CONTAINER_OPT_HTML_ID    => 'dd_id',
+                            ]
+                        ],
+                    ],
+                ],
+                'setAttributeData' => [
+                    ['first_container', Container::CONTAINER_OPT_HTML_TAG, 'dd'],
+                    ['first_container', Container::CONTAINER_OPT_HTML_CLASS, 'dd_class'],
+                    ['first_container', Container::CONTAINER_OPT_HTML_ID, 'dd_id'],
+                ],
+                'setAttributeCalls' => 3,
             ]
         ];
     }
@@ -132,7 +152,7 @@ public function testProcessWithException($structureElements)
             ->method('getElements')
             ->willReturn($structureElements);
 
-        $this->structureMock->expects($this->once())
+        $this->structureMock->expects($this->never())
             ->method('setAttribute')
             ->willReturnSelf();