Skip to content

Commit 090895d

Browse files
MC-39561: setup-integration test fail with Area code "adminhtml" does not exist.
1 parent eaa1cdc commit 090895d

File tree

2 files changed

+42
-1
lines changed
  • dev/tests/setup-integration

2 files changed

+42
-1
lines changed

dev/tests/setup-integration/etc/di/preferences/cli/ce.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
use Magento\Framework as MF;
8+
use Magento\TestFramework as TF;
9+
710
return [
8-
'\Magento\Framework\Mview\TriggerCleaner' => '\Magento\TestFramework\Mview\DummyTriggerCleaner',
11+
MF\App\AreaList::class => TF\App\AreaList::class,
12+
MF\Mview\TriggerCleaner::class => TF\Mview\DummyTriggerCleaner::class,
913
];
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\TestFramework\App;
9+
10+
use Magento\Framework\App\Area\FrontNameResolverFactory;
11+
use Magento\Framework\ObjectManagerInterface;
12+
13+
/**
14+
* Stub for \Magento\Framework\App\AreaList
15+
*/
16+
class AreaList extends \Magento\Framework\App\AreaList
17+
{
18+
/**
19+
* @param ObjectManagerInterface $objectManager
20+
* @param FrontNameResolverFactory $resolverFactory
21+
* @param array $areas
22+
* @param string|null $default
23+
*/
24+
public function __construct(
25+
ObjectManagerInterface $objectManager,
26+
FrontNameResolverFactory $resolverFactory,
27+
array $areas = [],
28+
$default = null
29+
) {
30+
parent::__construct($objectManager, $resolverFactory, $areas, $default);
31+
/**
32+
* Then Magento is installed for setup-integration tests, di.xml files are parsed from all Magento modules,
33+
* causing Magento\Framework\App\AreaList _areas property to be filled with arguments from disabled modules.
34+
*/
35+
$this->_areas = [];
36+
}
37+
}

0 commit comments

Comments
 (0)