Merge pull request #7435 from annando/select-to-array

[friendica.git] / tests / src / Console / AutomaticInstallationConsoleTest.php

diff --git a/tests/src/Console/AutomaticInstallationConsoleTest.php b/tests/src/Console/AutomaticInstallationConsoleTest.php
index acf5dac7bdc01d192f3f45ce80cfc35696ba7b59..57a3a4b37310cf8103fd10e713a6b05a9984a06a 100644 (file)
--- a/tests/src/Console/AutomaticInstallationConsoleTest.php
+++ b/tests/src/Console/AutomaticInstallationConsoleTest.php
@@ -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;
@@ -16,13 +16,10 @@ use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamFile;
 
 /**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
  * @requires PHP 7.0
  */
 class AutomaticInstallationConsoleTest extends ConsoleTest
 {
-       use L10nMockTrait;
        use DBAMockTrait;
        use DBStructureMockTrait;
        use RendererMockTrait;
@@ -43,6 +40,8 @@ class AutomaticInstallationConsoleTest extends ConsoleTest
 
        public function setUp()
        {
+               $this->markTestSkipped('Needs class \'Installer\' as constructing argument for console tests');
+
                parent::setUp();
 
                if ($this->root->hasChild('config' . DIRECTORY_SEPARATOR . 'local.config.php')) {
@@ -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);
@@ -392,7 +393,7 @@ FIN;
 
 // Local configuration
 
-// If you're unsure about what any of the config keys below do, please check the config/defaults.config.php for detailed
+// If you're unsure about what any of the config keys below do, please check the static/defaults.config.php for detailed
 // documentation of their data type and behavior.
 
 return [