Skip to content

Commit c6c5baf

Browse files
committed
OXDEV-7248 Update container parameter mocking
1 parent 4b27fdc commit c6c5baf

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

tests/Integration/TestingFixturesTrait.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
use OxidEsales\EshopCommunity\Internal\Framework\Module\Install\Service\ModuleInstallerInterface;
1515
use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Bridge\ModuleActivationBridgeInterface;
1616
use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
17+
use OxidEsales\EshopCommunity\Tests\ContainerTrait;
1718

1819
trait TestingFixturesTrait
1920
{
21+
use ContainerTrait;
22+
2023
private string $fixtureRoot = __DIR__;
2124

2225
public function initFixtures(string $fixtureRoot): void
@@ -45,7 +48,10 @@ public function deactivateModuleFixture(string $moduleId): void
4548

4649
public function setShopSourceFixture(): void
4750
{
48-
Registry::getConfig()->setConfigParam('sShopDir', "{$this->getFixturesDirectory()}/shop/source/");
51+
$this->createContainer();
52+
$this->container->setParameter('oxid_shop_source_directory', "{$this->getFixturesDirectory()}/shop/source/");
53+
$this->compileContainer();
54+
$this->attachContainerToContainerFactory();
4955
}
5056

5157
public function setThemeFixture(string $themeId): void

tests/Integration/TwigEngine/ControllerRender/ModuleControllerRenderTest.php

-6
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
use OxidEsales\Eshop\Core\Registry;
1414
use OxidEsales\Eshop\Core\ShopControl;
1515
use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
16-
use OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface;
1716
use OxidEsales\Twig\Tests\Integration\TestingFixturesTrait;
1817
use PHPUnit\Framework\TestCase;
1918
use Prophecy\Argument;
2019
use Prophecy\PhpUnit\ProphecyTrait;
2120
use Psr\Log\LoggerInterface;
2221

23-
/** @runTestsInSeparateProcesses */
2422
final class ModuleControllerRenderTest extends TestCase
2523
{
2624
use TestingFixturesTrait;
@@ -118,10 +116,6 @@ private function stubRequestData(): void
118116
private function switchDebugMode(bool $enable): void
119117
{
120118
$configFile = $this->prophesize(ConfigFile::class);
121-
$configFile->getVar('sCompileDir')
122-
->willReturn(
123-
$this->get(ContextInterface::class)->getCacheDirectory()
124-
);
125119
$configFile->getVar('iDebug')->willReturn($enable);
126120
Registry::set(ConfigFile::class, $configFile->reveal());
127121
}

0 commit comments

Comments
 (0)