Skip to content

#18668: Fixed store reinitialization for integration tests on projects with plugins on \Magento\TestFramework\App\Config #34372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 2.4-develop
Choose a base branch
from
Open

#18668: Fixed store reinitialization for integration tests on projects with plugins on \Magento\TestFramework\App\Config #34372

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e75d2d
#18668: Fixed store reinitialization on projects with plugins on \Mag…
bgorski Oct 18, 2021
50c0264
#18668: Fixed @inheritdoc annotations on methods from \Magento\TestFr…
bgorski Oct 18, 2021
ab73fc3
#18668: Fixed an error stating that \Magento\TestFramework\App\Config…
bgorski Oct 18, 2021
7665968
Merge branch '2.4-develop' into issue-18668
bgorski Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 28 additions & 29 deletions dev/tests/integration/framework/Magento/TestFramework/Store/StoreManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,12 @@

/**
* Integration tests decoration of store manager
*
* @package Magento\TestFramework\Store
*/
class StoreManager implements \Magento\Store\Model\StoreManagerInterface
{
/**
* @var \Magento\Store\Model\StoreManager
*/
protected $decoratedStoreManager;

/**
* @var \Magento\Framework\Event\ManagerInterface
*/
protected $eventManager;
private \Magento\Store\Model\StoreManager $decoratedStoreManager;
private \Magento\Framework\Event\ManagerInterface $eventManager;
private \Magento\TestFramework\App\Config $config;

/**
* @var null|bool
Expand All @@ -36,14 +28,16 @@ class StoreManager implements \Magento\Store\Model\StoreManagerInterface
*/
public function __construct(
\Magento\Store\Model\StoreManager $decoratedStoreManager,
\Magento\Framework\Event\ManagerInterface $eventManager
\Magento\Framework\Event\ManagerInterface $eventManager,
\Magento\TestFramework\App\Config $config
) {
$this->decoratedStoreManager = $decoratedStoreManager;
$this->eventManager = $eventManager;
$this->config = $config;
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function setCurrentStore($store)
{
Expand All @@ -52,7 +46,7 @@ public function setCurrentStore($store)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function setIsSingleStoreModeAllowed($value)
{
Expand All @@ -61,7 +55,7 @@ public function setIsSingleStoreModeAllowed($value)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function hasSingleStore()
{
Expand All @@ -71,7 +65,7 @@ public function hasSingleStore()
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function isSingleStoreMode()
{
Expand All @@ -81,7 +75,7 @@ public function isSingleStoreMode()
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getStore($storeId = null)
{
Expand All @@ -91,7 +85,7 @@ public function getStore($storeId = null)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getStores($withDefault = false, $codeKey = false)
{
Expand All @@ -101,7 +95,7 @@ public function getStores($withDefault = false, $codeKey = false)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getWebsite($websiteId = null)
{
Expand All @@ -111,7 +105,7 @@ public function getWebsite($websiteId = null)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getWebsites($withDefault = false, $codeKey = false)
{
Expand All @@ -121,25 +115,30 @@ public function getWebsites($withDefault = false, $codeKey = false)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function reinitStores()
{
//In order to restore configFixture values
$testAppConfig = ObjectManager::getInstance()->get(Config::class);
$reflection = new \ReflectionClass($testAppConfig);
$dataProperty = $reflection->getProperty('data');
$reflection = new \ReflectionClass($this->config);

if (\substr($reflection->getName(), -12) === '\Interceptor') {
$dataProperty = $reflection->getParentClass()->getProperty('data');
} else {
$dataProperty = $reflection->getProperty('data');
}

$dataProperty->setAccessible(true);
$savedConfig = $dataProperty->getValue($testAppConfig);
$savedConfig = $dataProperty->getValue($this->config);

$this->decoratedStoreManager->reinitStores();

$dataProperty->setValue($testAppConfig, $savedConfig);
$dataProperty->setValue($this->config, $savedConfig);
$this->dispatchInitCurrentStoreAfterEvent();
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getDefaultStoreView()
{
Expand All @@ -149,7 +148,7 @@ public function getDefaultStoreView()
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getGroup($groupId = null)
{
Expand All @@ -159,7 +158,7 @@ public function getGroup($groupId = null)
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function getGroups($withDefault = false)
{
Expand Down