Skip to content

Commit d34160a

Browse files
author
Karpenko, Oleksandr
committed
MAGETWO-69426: app:config:dump exports ids to the config file
1 parent 62e6295 commit d34160a

File tree

2 files changed

+26
-14
lines changed

2 files changed

+26
-14
lines changed

dev/tests/integration/testsuite/Magento/Deploy/Console/Command/App/ApplicationDumpCommandTest.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,6 @@ public function testExecute()
202202
*/
203203
private function validateSystemSection(array $config)
204204
{
205-
$themesMap = [
206-
1 => 'adminhtml/Magento/backend',
207-
2 => 'frontend/Magento/blank',
208-
3 => 'frontend/Magento/luma'
209-
];
210205
$this->assertArrayHasKey('test_value_1', $config['system']['default']['web']['test']);
211206
$this->assertArrayHasKey('test_value_2', $config['system']['default']['web']['test']);
212207
$this->assertArrayHasKey('test_sensitive1', $config['system']['default']['web']['test']);
@@ -220,9 +215,18 @@ private function validateSystemSection(array $config)
220215
$this->assertArrayNotHasKey('test_sensitive_environment6', $config['system']['default']['web']['test']);
221216
$this->assertArrayNotHasKey('test_environment9', $config['system']['default']['web']['test']);
222217
/** @see Magento/Deploy/_files/config_data.php */
223-
$this->assertEquals($themesMap[2], $config['system']['default']['design']['theme']['theme_id']);
224-
$this->assertEquals($themesMap[3], $config['system']['stores']['default']['design']['theme']['theme_id']);
225-
$this->assertEquals($themesMap[3], $config['system']['websites']['base']['design']['theme']['theme_id']);
218+
$this->assertEquals(
219+
'frontend/Magento/blank',
220+
$config['system']['default']['design']['theme']['theme_id']
221+
);
222+
$this->assertEquals(
223+
'frontend/Magento/luma',
224+
$config['system']['stores']['default']['design']['theme']['theme_id']
225+
);
226+
$this->assertEquals(
227+
'frontend/Magento/luma',
228+
$config['system']['websites']['base']['design']['theme']['theme_id']
229+
);
226230

227231
$this->assertEquals('value from the file', $config['system']['default']['web']['test']['test_value_3']);
228232
$this->assertEquals('GB', $config['system']['default']['general']['country']['default']);

dev/tests/integration/testsuite/Magento/Deploy/_files/config_data.php

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
use Magento\Config\Model\Config\Factory;
8+
use Magento\Framework\App\Config\ScopeConfigInterface;
9+
use Magento\Framework\View\DesignInterface;
10+
use Magento\TestFramework\Helper\Bootstrap;
11+
use Magento\Theme\Model\ResourceModel\Theme\Collection;
12+
13+
$themeList = $objectManager->create(Collection::class);
614
$configData = [
715
'default' => [
816
'web/test/test_value_1' => 'http://local2.test/',
@@ -20,25 +28,25 @@
2028
'web/test/test_environment7' => 'some_value7',
2129
'web/test/test_environment8' => 'some_value8',
2230
'web/test/test_environment9' => 'some_value9',
23-
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID => 2
31+
DesignInterface::XML_PATH_THEME_ID => $themeList->getThemeByFullPath('frontend/Magento/blank')->getThemeId()
2432
],
2533
'stores' => [
2634
'default' => [
27-
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID => 3
35+
DesignInterface::XML_PATH_THEME_ID => $themeList->getThemeByFullPath('frontend/Magento/luma')->getThemeId()
2836
]
2937
],
3038
'websites' => [
3139
'base' => [
32-
\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID => 3
40+
DesignInterface::XML_PATH_THEME_ID => $themeList->getThemeByFullPath('frontend/Magento/luma')->getThemeId()
3341
]
3442
],
3543
];
3644

37-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
38-
$configFactory = $objectManager->create(\Magento\Config\Model\Config\Factory::class);
45+
$objectManager = Bootstrap::getObjectManager();
46+
$configFactory = $objectManager->create(Factory::class);
3947

4048
foreach ($configData as $scope => $data) {
41-
if ($scope === \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
49+
if ($scope === ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
4250
foreach ($data as $path => $value) {
4351
$config = $configFactory->create();
4452
$config->setScope($scope);

0 commit comments

Comments
 (0)