keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix tests (#5400)

Browse source 
* Avoid argc side-effects

* Fix undefined array keys in JITConfigAdapter::set()

* Avoid argv side effects in ApiTest
This commit is contained in:
Pierre Rudloff 2018-07-18 22:30:55 +02:00 committed by Hypolite Petovan
parent b265bf2ec3
commit 6e1ed0b0d3
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Core/Config/JITConfigAdapter.php
View file

@ -96,6 +96,13 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
$stored = $this->get($cat, $k, null, true); $stored = $this->get($cat, $k, null, true);
if (!isset($this->in_db[$cat])) {
$this->in_db[$cat] = [];
}
if (!isset($this->in_db[$cat][$k])) {
$this->in_db[$cat] = false;
}
if (($stored === $dbvalue) && $this->in_db[$cat][$k]) { if (($stored === $dbvalue) && $this->in_db[$cat][$k]) {
return true; return true;
} }

12
tests/ApiTest.php
View file

@ -68,6 +68,18 @@ class ApiTest extends DatabaseTest
Config::set('system', 'theme', 'system_theme'); Config::set('system', 'theme', 'system_theme');
} }
/**
* Cleanup variables used by tests.
*/
protected function tearDown()
{
parent::tearDown();
$app = get_app();
$app->argc = 1;
$app->argv = ['home'];
}
/** /**
* Assert that an user array contains expected keys. * Assert that an user array contains expected keys.
* @param array $user User array * @param array $user User array