Merge remote-tracking branch 'origin/MAGETWO-49766' into BUGS

Author: slavvka

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -133,4 +133,9 @@
         </arguments>
     </type>
     <preference for="Magento\Framework\App\Router\PathConfigInterface" type="Magento\Backend\Model\AdminPathConfig" />
+    <type name="Magento\Framework\View\Page\Config">
+        <arguments>
+            <argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
+        </arguments>
+    </type>
 </config>

lib/internal/Magento/Framework/View/Page/Config.php

@@ -122,6 +122,11 @@ class Config
      */
     private $areaResolver;
 
+    /**
+     * @var bool
+     */
+    private $isIncludesAvailable;
+
     /**
      * This getter serves as a workaround to add this dependency to this class without breaking constructor structure.
      *
@@ -145,21 +150,24 @@ private function getAreaResolver()
      * @param \Magento\Framework\View\Page\FaviconInterface $favicon
      * @param Title $title
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param bool $isIncludesAvailable
      */
     public function __construct(
         View\Asset\Repository $assetRepo,
         View\Asset\GroupedCollection $pageAssets,
         App\Config\ScopeConfigInterface $scopeConfig,
         View\Page\FaviconInterface $favicon,
         Title $title,
-        \Magento\Framework\Locale\ResolverInterface $localeResolver
+        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        $isIncludesAvailable = true
     ) {
         $this->assetRepo = $assetRepo;
         $this->pageAssets = $pageAssets;
         $this->scopeConfig = $scopeConfig;
         $this->favicon = $favicon;
         $this->title = $title;
         $this->localeResolver = $localeResolver;
+        $this->isIncludesAvailable = $isIncludesAvailable;
         $this->setElementAttribute(
             self::ELEMENT_TYPE_HTML,
             self::HTML_ATTRIBUTE_LANG,
@@ -555,7 +563,7 @@ public function getDefaultFavicon()
      */
     public function getIncludes()
     {
-        if (empty($this->includes)) {
+        if (empty($this->includes) && $this->isIncludesAvailable) {
             $this->includes = $this->scopeConfig->getValue(
                 'design/head/includes',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE

lib/internal/Magento/Framework/View/Test/Unit/Page/ConfigTest.php

@@ -69,6 +69,11 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
      */
     protected $areaResolverMock;
 
+    /**
+     * @var \Magento\Framework\Locale\ResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeMock;
+
     protected function setUp()
     {
         $this->assetRepo = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
@@ -79,8 +84,8 @@ protected function setUp()
         $this->asset = $this->getMock('Magento\Framework\View\Asset\File', [], [], '', false);
         $this->remoteAsset = $this->getMock('\Magento\Framework\View\Asset\Remote', [], [], '', false);
         $this->title = $this->getMock('Magento\Framework\View\Page\Title', [], [], '', false);
-        $locale = $this->getMockForAbstractClass('Magento\Framework\Locale\ResolverInterface', [], '', false);
-        $locale->expects($this->any())
+        $this->localeMock = $this->getMockForAbstractClass('Magento\Framework\Locale\ResolverInterface', [], '', false);
+        $this->localeMock->expects($this->any())
             ->method('getLocale')
             ->willReturn(Resolver::DEFAULT_LOCALE);
         $this->model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
@@ -91,7 +96,7 @@ protected function setUp()
                     'pageAssets' => $this->pageAssets,
                     'scopeConfig' => $this->scopeConfig,
                     'favicon' => $this->favicon,
-                    'localeResolver' => $locale,
+                    'localeResolver' => $this->localeMock
                 ]
             );
 
@@ -498,16 +503,43 @@ public function testGetDefaultFavicon()
         $this->model->getDefaultFavicon();
     }
 
-    public function testGetIncludes()
+    /**
+     * @param bool $isAvailable
+     * @param string $result
+     * @dataProvider getIncludesDataProvider
+     */
+    public function testGetIncludes($isAvailable, $result)
     {
-        $xml = '
-            <script type="text/javascript">
-                Fieldset.addToPrefix(1);
-            </script>
-            ';
-        $this->scopeConfig->expects($this->once())->method('getValue')->with('design/head/includes', 'store')->will(
-            $this->returnValue($xml)
-        );
-        $this->assertEquals($xml, $this->model->getIncludes());
+        $model = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this))
+            ->getObject(
+                'Magento\Framework\View\Page\Config',
+                [
+                    'assetRepo' => $this->assetRepo,
+                    'pageAssets' => $this->pageAssets,
+                    'scopeConfig' => $this->scopeConfig,
+                    'favicon' => $this->favicon,
+                    'localeResolver' => $this->localeMock,
+                    'isIncludesAvailable' => $isAvailable
+                ]
+            );
+
+        $this->scopeConfig->expects($isAvailable ? $this->once() : $this->never())
+            ->method('getValue')
+            ->with('design/head/includes', 'store')
+            ->willReturn($result);
+        $this->assertEquals($result, $model->getIncludes());
+    }
+
+    public function getIncludesDataProvider()
+    {
+        return [
+            [
+                true,
+                '<script type="text/javascript">
+                    Fieldset.addToPrefix(1);
+                </script>'
+            ],
+            [false, null]
+        ];
     }
 }