Merge pull request #7379 from nupplaphil/task/refactor_l10n_for_test

Refactor L10n for testing
This commit is contained in:
Hypolite Petovan 2019-07-16 16:03:42 -04:00 committed by GitHub
commit 0b97b32a59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 596 additions and 450 deletions

View file

@ -5,10 +5,10 @@ namespace Friendica\Test\src\Console;
use Friendica\Console\AutomaticInstallation;
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\Installer;
use Friendica\Core\L10n\L10n;
use Friendica\Core\Logger;
use Friendica\Test\Util\DBAMockTrait;
use Friendica\Test\Util\DBStructureMockTrait;
use Friendica\Test\Util\L10nMockTrait;
use Friendica\Test\Util\RendererMockTrait;
use Friendica\Util\BaseURL;
use Friendica\Util\Logger\VoidLogger;
@ -20,7 +20,6 @@ use org\bovigo\vfs\vfsStreamFile;
*/
class AutomaticInstallationConsoleTest extends ConsoleTest
{
use L10nMockTrait;
use DBAMockTrait;
use DBStructureMockTrait;
use RendererMockTrait;
@ -50,7 +49,9 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
->removeChild('local.config.php');
}
$this->mockL10nT();
$l10nMock = \Mockery::mock(L10n::class);
$l10nMock->shouldReceive('t')->andReturnUsing(function ($args) { return $args; });
\Friendica\Core\L10n::init($l10nMock);
$this->configCache = new ConfigCache();
$this->configCache->set('system', 'basepath', $this->root->url());
@ -72,7 +73,7 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
return $this->configCache->get($cat, $key);
});
$this->configMock->shouldReceive('load')->andReturnUsing(function ($config, $overwrite = false) {
return $this->configCache->load($config, $overwrite);
$this->configCache->load($config, $overwrite);
});
$this->mode->shouldReceive('isInstall')->andReturn(true);