Merge remote-tracking branch 'origin/MDVA-232' into 2.0.5_backlog

Author: magento-services-vantiv-deploy

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

@@ -117,6 +117,27 @@ class Config
         'robots' => null,
     ];
 
+    /**
+     * @var \Magento\Framework\App\State
+     */
+    private $areaResolver;
+
+    /**
+     * This getter serves as a workaround to add this dependency to this class without breaking constructor structure.
+     *
+     * @return \Magento\Framework\App\State
+     *
+     * @deprecated
+     */
+    private function getAreaResolver()
+    {
+        if ($this->areaResolver === null) {
+            $this->areaResolver = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get('Magento\Framework\App\State');
+        }
+        return $this->areaResolver;
+    }
+
     /**
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\Asset\GroupedCollection $pageAssets
@@ -350,6 +371,9 @@ public function setRobots($robots)
      */
     public function getRobots()
     {
+        if ($this->getAreaResolver()->getAreaCode() !== 'frontend') {
+            return 'NOINDEX,NOFOLLOW';
+        }
         $this->build();
         if (empty($this->metadata['robots'])) {
             $this->metadata['robots'] = $this->scopeConfig->getValue(

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

@@ -59,6 +59,11 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
      */
     protected $title;
 
+    /**
+     * @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $areaResolverMock;
+
     public function setUp()
     {
         $this->assetRepo = $this->getMock('Magento\Framework\View\Asset\Repository', [], [], '', false);
@@ -84,6 +89,11 @@ public function setUp()
                     'localeResolver' => $locale,
                 ]
             );
+
+        $this->areaResolverMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
+        $areaResolverReflection = (new \ReflectionClass(get_class($this->model)))->getProperty('areaResolver');
+        $areaResolverReflection->setAccessible(true);
+        $areaResolverReflection->setValue($this->model, $this->areaResolverMock);
     }
 
     public function testSetBuilder()
@@ -202,13 +212,15 @@ public function testKeywordsEmpty()
 
     public function testRobots()
     {
+        $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('frontend');
         $robots = 'test_robots';
         $this->model->setRobots($robots);
         $this->assertEquals($robots, $this->model->getRobots());
     }
 
     public function testRobotsEmpty()
     {
+        $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('frontend');
         $expectedData = 'default_robots';
         $this->scopeConfig->expects($this->once())->method('getValue')->with(
             'design/search_engine_robots/default_robots',
@@ -218,6 +230,14 @@ public function testRobotsEmpty()
         $this->assertEquals($expectedData, $this->model->getRobots());
     }
 
+    public function testRobotsAdminhtml()
+    {
+        $this->areaResolverMock->expects($this->once())->method('getAreaCode')->willReturn('adminhtml');
+        $robots = 'test_robots';
+        $this->model->setRobots($robots);
+        $this->assertEquals('NOINDEX,NOFOLLOW', $this->model->getRobots());
+    }
+
     public function testGetAssetCollection()
     {
         $this->assertInstanceOf('Magento\Framework\View\Asset\GroupedCollection', $this->model->getAssetCollection());