MAGETWO-69535: Error during importing new list of scopes through shared file

Author: shiftedreality

app/code/Magento/Store/App/Config/InitialConfigSource.php renamed to app/code/Magento/Store/App/Config/Source/InitialConfigSource.php

@@ -3,36 +3,43 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Store\App\Config;
+namespace Magento\Store\App\Config\Source;
 
 use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\DataObject;
 
+/**
+ * Config source to retrieve configuration from files.
+ */
 class InitialConfigSource implements ConfigSourceInterface
 {
     /**
+     * The file reader
+     *
      * @var Reader
      */
     private $reader;
 
     /**
+     * The deployment config reader
+     *
      * @var DeploymentConfig
      */
     private $deploymentConfig;
 
     /**
+     * The config type
+     *
      * @var string
      */
     private $configType;
 
     /**
-     * DataProvider constructor.
-     *
-     * @param Reader $reader
-     * @param DeploymentConfig $deploymentConfig
-     * @param string $configType
+     * @param Reader $reader The file reader
+     * @param DeploymentConfig $deploymentConfig The deployment config reader
+     * @param string $configType The config type
      */
     public function __construct(Reader $reader, DeploymentConfig $deploymentConfig, $configType)
     {
@@ -57,7 +64,9 @@ public function get($path = '')
         }
 
         $data = new DataObject($this->reader->load());
+
         if ($path !== '' && $path !== null) {
+            $path = ltrim($path, '/');
             $path = '/' . $path;
         }
 

app/code/Magento/Store/Test/Unit/App/Config/Source/InitialConfigSourceTest.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Test\Unit\App\Config\Source;
+
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\DeploymentConfig\Reader;
+use Magento\Store\App\Config\Source\InitialConfigSource;
+use PHPUnit_Framework_MockObject_MockObject as Mock;
+
+/**
+ * @inheritdoc
+ */
+class InitialConfigSourceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Reader|Mock
+     */
+    private $readerMock;
+
+    /**
+     * @var DeploymentConfig|Mock
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var InitialConfigSource
+     */
+    private $source;
+
+    /**
+     * @inheritdoc
+     */
+    public function setUp()
+    {
+        $this->readerMock = $this->getMockBuilder(Reader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->source = new InitialConfigSource(
+            $this->readerMock,
+            $this->deploymentConfigMock,
+            'configType'
+        );
+    }
+
+    public function testGet()
+    {
+        $path = 'path';
+
+        $this->readerMock->expects($this->once())
+            ->method('load')
+            ->willReturn(['configType' => [$path => 'value']]);
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(true);
+
+        $this->assertEquals('value', $this->source->get($path));
+    }
+
+    public function testGetNotInstalled()
+    {
+        $path = 'path';
+
+        $this->readerMock->expects($this->never())
+            ->method('load');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('isAvailable')
+            ->willReturn(false);
+
+        $this->assertEquals([], $this->source->get($path));
+    }
+}

app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/CreateTest.php

@@ -110,7 +110,6 @@ public function testRunWebsite()
             'name' => 'Main Website',
             'sort_order' => '0',
             'is_default' => '1',
-            'default_group_id' => '1',
         ];
         $data = [
             'websites' => $websites,

app/code/Magento/Store/etc/di.xml

@@ -346,7 +346,7 @@
             </argument>
         </arguments>
     </virtualType>
-    <virtualType name="scopesConfigInitialDataProvider" type="Magento\Store\App\Config\InitialConfigSource">
+    <virtualType name="scopesConfigInitialDataProvider" type="Magento\Store\App\Config\Source\InitialConfigSource">
         <arguments>
             <argument name="reader" xsi:type="object">Magento\Framework\App\DeploymentConfig\Reader</argument>
             <argument name="configType" xsi:type="const">Magento\Store\App\Config\Type\Scopes::CONFIG_TYPE</argument>