Merge remote-tracking branch 'origin/MAGETWO-46533-Mage-Mode' into PR_Branch

Author: monkeysee

setup/src/Magento/Setup/Model/ConfigGenerator.php

@@ -235,7 +235,9 @@ public function createXFrameConfig()
     public function createModeConfig()
     {
         $configData = new ConfigData(ConfigFilePool::APP_ENV);
-        $configData->set(State::PARAM_MODE, State::MODE_DEFAULT);
+        if ($this->deploymentConfig->get(State::PARAM_MODE) === null) {
+            $configData->set(State::PARAM_MODE, State::MODE_DEFAULT);
+        }
         return $configData;
     }
 

setup/src/Magento/Setup/Test/Unit/Model/ConfigGeneratorTest.php

@@ -3,16 +3,16 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Setup\Test\Unit\Model;
 
-
 use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\App\State;
 
 class ConfigGeneratorTest extends \PHPUnit_Framework_TestCase
 {
     /** @var  \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */
     private $deploymentConfigMock;
+
     /** @var  \Magento\Setup\Model\ConfigGenerator | \PHPUnit_Framework_MockObject_MockObject */
     private $model;
 
@@ -58,4 +58,24 @@ public function testCreateCacheHostsConfig()
         $configData = $this->model->createCacheHostsConfig($data);
         $this->assertEquals($expectedData, $configData->getData()[ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS]);
     }
+
+    public function testCreateModeConfig()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with(State::PARAM_MODE)
+            ->willReturn(null);
+        $configData = $this->model->createModeConfig();
+        $this->assertSame(State::MODE_DEFAULT, $configData->getData()[State::PARAM_MODE]);
+    }
+
+    public function testCreateModeConfigIfAlreadySet()
+    {
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with(State::PARAM_MODE)
+            ->willReturn(State::MODE_PRODUCTION);
+        $configData = $this->model->createModeConfig();
+        $this->assertSame([], $configData->getData());
+    }
 }