FIX Correctly clear extensions after each scenario (#241)

This commit is contained in:
Guy Sartorelli 2023-05-19 11:13:53 +12:00 committed by GitHub
parent 24bec4a15b
commit 937dd5e006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -69,6 +69,11 @@ class FixtureContext implements Context
*/ */
protected $activatedConfigFiles = array(); protected $activatedConfigFiles = array();
/**
* @var string[][] Tracks any extensions that have been added to classes
*/
protected $addedExtensions = array();
/** /**
* @var array Stores the asset tuples. * @var array Stores the asset tuples.
*/ */
@ -660,6 +665,10 @@ class FixtureContext implements Context
/** @var Extensible $targetClass */ /** @var Extensible $targetClass */
$targetClass = $this->convertTypeToClass($class); $targetClass = $this->convertTypeToClass($class);
$targetClass::add_extension($extension); $targetClass::add_extension($extension);
if (!array_key_exists($targetClass, $this->addedExtensions)) {
$this->addedExtensions[$targetClass] = [];
}
$this->addedExtensions[$targetClass][] = $extension;
// Write config for this extension too... // Write config for this extension too...
$snakedExtension = strtolower(str_replace('\\', '-', $extension ?? '') ?? ''); $snakedExtension = strtolower(str_replace('\\', '-', $extension ?? '') ?? '');
@ -793,6 +802,7 @@ YAML;
public function afterResetConfig(AfterScenarioScope $event) public function afterResetConfig(AfterScenarioScope $event)
{ {
$this->clearConfigFiles(); $this->clearConfigFiles();
$this->clearExtensions();
// Flush // Flush
$this->getMainContext()->visit('/?flush'); $this->getMainContext()->visit('/?flush');
} }
@ -951,6 +961,17 @@ YAML;
return join('/', $paths); return join('/', $paths);
} }
protected function clearExtensions()
{
foreach ($this->addedExtensions as $targetClass => $extensions) {
foreach ($extensions as $extension) {
/** @var Extensible $targetClass */
$targetClass::remove_extension($extension);
}
}
$this->addedExtensions = [];
}
protected function clearConfigFiles() protected function clearConfigFiles()
{ {
// No files to cleanup // No files to cleanup