Skip to content

test: fix BaseConfigTest #8095

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

Merged
merged 4 commits into from
Oct 26, 2023
Merged

test: fix BaseConfigTest #8095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccbddae
test: reset state after testing
kenjis Oct 25, 2023
bfecd50
docs: add @psalm-suppress
kenjis Oct 25, 2023
469eef4
feat: add reset() for testing
kenjis Oct 26, 2023
f42244f
test: add tearDown() and tweak setUp()
kenjis Oct 26, 2023
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
12 changes: 12 additions & 0 deletions system/Config/BaseConfig.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,18 @@ public static function setModules(Modules $modules): void
static::$moduleConfig = $modules;
}

/**
* @internal For testing purposes only.
* @testTag
*/
public static function reset(): void
{
static::$registrars = [];
static::$override = true;
static::$didDiscovery = false;
static::$moduleConfig = null;
}

/**
* Will attempt to get environment variables with names
* that match the properties of the child class.
Expand Down
21 changes: 18 additions & 3 deletions tests/system/Config/BaseConfigTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,17 @@ protected function setUp(): void
require $this->fixturesFolder . '/Encryption.php';
}

BaseConfig::$registrars = [];
BaseConfig::setModules(new Modules()); // reset to clean copy of Modules
BaseConfig::reset();
}

protected function tearDown(): void
{
parent::tearDown();

// This test modifies BaseConfig::$modules, so should reset.
BaseConfig::reset();
// This test modifies Services locator, so should reset.
$this->resetServices();
}

public function testBasicValues(): void
Expand Down Expand Up @@ -271,18 +280,24 @@ public function testBadRegistrar(): void
$this->assertSame('bar', $config->foo);
}

/**
* @psalm-suppress UndefinedClass
*/
public function testDiscoveryNotEnabledWillNotPopulateRegistrarsArray(): void
{
/** @var MockObject&Modules $modules */
$modules = $this->createMock(Modules::class);
$modules->method('shouldDiscover')->with('registrars')->willReturn(false);

RegistrarConfig::setModules($modules);

$config = new RegistrarConfig();

$this->assertSame([], $config::$registrars);
}

/**
* @psalm-suppress UndefinedClass
*/
public function testRedoingDiscoveryWillStillSetDidDiscoveryPropertyToTrue(): void
{
/** @var FileLocator&MockObject $locator */
Expand Down