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

Fix and adapt tests

Browse source
This commit is contained in:
Philipp 2023-02-12 13:09:05 +01:00
parent 23742c22c3
commit ad284208ee
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
3 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/Util/CreateDatabaseTrait.php
View file

@ -37,8 +37,15 @@ trait CreateDatabaseTrait
use DatabaseTestTrait; use DatabaseTestTrait;
use VFSTrait; use VFSTrait;
/** @var Database|null */
protected $dba = null;
public function getDbInstance(): Database public function getDbInstance(): Database
{ {
if (isset($this->dba)) {
return $this->dba;
}
$configFileManager = new ConfigFileManager($this->root->url(), $this->root->url() . '/config/', $this->root->url() . '/static/'); $configFileManager = new ConfigFileManager($this->root->url(), $this->root->url() . '/config/', $this->root->url() . '/static/');
$config = new ReadOnlyFileConfig(new Cache([ $config = new ReadOnlyFileConfig(new Cache([
'database' => [ 'database' => [

45
tests/Util/VFSTrait.php
View file

@ -49,45 +49,38 @@ trait VFSTrait
// create a virtual directory and copy all needed files and folders to it // create a virtual directory and copy all needed files and folders to it
$this->root = vfsStream::setup('friendica', 0777, $structure); $this->root = vfsStream::setup('friendica', 0777, $structure);
$this->setConfigFile('dbstructure.config.php', true); $this->setConfigFile('static' . DIRECTORY_SEPARATOR . 'dbstructure.config.php', true);
$this->setConfigFile('dbview.config.php', true); $this->setConfigFile('static' . DIRECTORY_SEPARATOR . 'dbview.config.php', true);
$this->setConfigFile('defaults.config.php', true); $this->setConfigFile('static' . DIRECTORY_SEPARATOR . 'defaults.config.php', true);
$this->setConfigFile('settings.config.php', true); $this->setConfigFile('static' . DIRECTORY_SEPARATOR . 'settings.config.php', true);
$this->setConfigFile('local.config.php'); $this->setConfigFile(
$this->setDataFile('node.config.php'); 'mods' . DIRECTORY_SEPARATOR . 'local.config.vagrant.php',
} false, 'local.config.php'
);
protected function setDataFile(string $filename)
{
$file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
'datasets' . DIRECTORY_SEPARATOR .
'config' . DIRECTORY_SEPARATOR .
$filename;
if (file_exists($file)) {
vfsStream::newFile($filename)
->at($this->root->getChild('config'))
->setContent(file_get_contents($file));
}
} }
/** /**
* Copying a config file from the file system to the Virtual File System * Copying a config file from the file system to the Virtual File System
* *
* @param string $filename The filename of the config file * @param string $sourceFilePath The filename of the config file
* @param bool $static True, if the folder `static` instead of `config` should be used * @param bool $static True, if the folder `static` instead of `config` should be used
*/ */
protected function setConfigFile(string $filename, bool $static = false) protected function setConfigFile(string $sourceFilePath, bool $static = false, string $targetFileName = null)
{ {
$file = dirname(__DIR__) . DIRECTORY_SEPARATOR . $file = dirname(__DIR__) . DIRECTORY_SEPARATOR .
'..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR .
($static ? 'static' : 'config') . DIRECTORY_SEPARATOR . $sourceFilePath;
$filename;
if (file_exists($file)) { if (file_exists($file)) {
vfsStream::newFile($filename) if (empty($targetFileName)) {
$tmpArray = preg_split('/\\' . DIRECTORY_SEPARATOR . '/', $sourceFilePath);
$targetFileName = array_pop($tmpArray);
}
vfsStream::newFile($targetFileName)
->at($this->root->getChild(($static ? 'static' : 'config'))) ->at($this->root->getChild(($static ? 'static' : 'config')))
->setContent(file_get_contents($file)); ->setContent(file_get_contents($file));
} else {
throw new \Exception(sprintf('Unexpected missing config \'%s\'', $file));
} }
} }

8
tests/src/Module/Api/GnuSocial/GnuSocial/ConfigTest.php
View file

@ -41,12 +41,12 @@ class ConfigTest extends ApiTest
->run($this->httpExceptionMock); ->run($this->httpExceptionMock);
$json = $this->toJson($response); $json = $this->toJson($response);
self::assertEquals('localhost', $json->site->server); self::assertEquals(DI::config()->get('config', 'hostname'), $json->site->server);
self::assertEquals('frio', $json->site->theme); self::assertEquals(DI::config()->get('system', 'theme'), $json->site->theme);
self::assertEquals(DI::baseUrl() . '/images/friendica-64.png', $json->site->logo); self::assertEquals(DI::baseUrl() . '/images/friendica-64.png', $json->site->logo);
self::assertTrue($json->site->fancy); self::assertTrue($json->site->fancy);
self::assertEquals('en', $json->site->language); self::assertEquals(DI::config()->get('system', 'language'), $json->site->language);
self::assertEquals('UTC', $json->site->timezone); self::assertEquals(DI::config()->get('system', 'default_timezone'), $json->site->timezone);
self::assertEquals(200000, $json->site->textlimit); self::assertEquals(200000, $json->site->textlimit);
self::assertFalse($json->site->private); self::assertFalse($json->site->private);
self::assertEquals('always', $json->site->ssl); self::assertEquals('always', $json->site->ssl);