Skip to content

Commit

Permalink
FIX Correctly clear extensions after each scenario (#241)
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli authored May 18, 2023
1 parent 24bec4a commit 937dd5e
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions src/Context/FixtureContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ class FixtureContext implements Context
*/
protected $activatedConfigFiles = array();

/**
* @var string[][] Tracks any extensions that have been added to classes
*/
protected $addedExtensions = array();

/**
* @var array Stores the asset tuples.
*/
Expand Down Expand Up @@ -660,6 +665,10 @@ class_exists($extension ?? '') && is_subclass_of($extension, Extension::class),
/** @var Extensible $targetClass */
$targetClass = $this->convertTypeToClass($class);
$targetClass::add_extension($extension);
if (!array_key_exists($targetClass, $this->addedExtensions)) {
$this->addedExtensions[$targetClass] = [];
}
$this->addedExtensions[$targetClass][] = $extension;

// Write config for this extension too...
$snakedExtension = strtolower(str_replace('\\', '-', $extension ?? '') ?? '');
Expand Down Expand Up @@ -793,6 +802,7 @@ public function aRecordWasLastEditedRelative($type, $id, $mod, $time)
public function afterResetConfig(AfterScenarioScope $event)
{
$this->clearConfigFiles();
$this->clearExtensions();
// Flush
$this->getMainContext()->visit('/?flush');
}
Expand Down Expand Up @@ -951,6 +961,17 @@ protected function joinPaths()
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()
{
// No files to cleanup
Expand Down

0 comments on commit 937dd5e

Please sign in to comment.