Merge branch '2.3-develop' of github.com:furan917/magento2 into 2.3-develop

furan917 · furan917 · commit d124b0436d56 · 2019-07-19T09:54:53.000+01:00
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
@@ -274,7 +274,7 @@ public function testAddContainerInvalidHtmlTag()
     {
         $msg = 'Html tag "span" is forbidden for usage in containers. ' .
             'Consider to use one of the allowed: aside, dd, div, dl, fieldset, main, nav, ' .
-            'header, footer, ol, p, section, table, tfoot, ul.';
+            'header, footer, ol, p, section, table, tfoot, ul, h1, h2, h3, h4, h5, h6.';
         $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
         $this->expectExceptionMessage($msg);
         $this->_layout->addContainer('container', 'Container', ['htmlTag' => 'span']);

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ public function testAddContainerInvalidHtmlTag()`
`274`	`274`	`{`
`275`	`275`	`$msg = 'Html tag "span" is forbidden for usage in containers. ' .`
`276`	`276`	`'Consider to use one of the allowed: aside, dd, div, dl, fieldset, main, nav, ' .`
`277`		`- 'header, footer, ol, p, section, table, tfoot, ul.';`
	`277`	`+ 'header, footer, ol, p, section, table, tfoot, ul, h1, h2, h3, h4, h5, h6.';`
`278`	`278`	`$this->expectException(\Magento\Framework\Exception\LocalizedException::class);`
`279`	`279`	`$this->expectExceptionMessage($msg);`
`280`	`280`	`$this->_layout->addContainer('container', 'Container', ['htmlTag' => 'span']);`