X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/3acea12f1c0013be4f1e3994cae2ea662e43bb4e..refs/pull/2227/head:/tests/Unit/ConfigTest.php diff --git a/tests/Unit/ConfigTest.php b/tests/Unit/ConfigTest.php index 967915af9..1374b3aa9 100644 --- a/tests/Unit/ConfigTest.php +++ b/tests/Unit/ConfigTest.php @@ -1,4 +1,7 @@ -checkEnvConfigResult('STORAGE_IMAGE_TYPE', 's3', 'filesystems.images', 's3'); - $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', null, 'filesystems.images', 'local_secure'); - - putenv('STORAGE_TYPE=local'); + $this->runWithEnv('STORAGE_TYPE', 'local_secure', function() { + $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', 's3', 'filesystems.images', 's3'); + $this->checkEnvConfigResult('STORAGE_IMAGE_TYPE', null, 'filesystems.images', 'local_secure'); + }); } public function test_filesystem_attachments_falls_back_to_storage_type_var() { - putenv('STORAGE_TYPE=local_secure'); - - $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', 's3', 'filesystems.attachments', 's3'); - $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', null, 'filesystems.attachments', 'local_secure'); - - putenv('STORAGE_TYPE=local'); + $this->runWithEnv('STORAGE_TYPE', 'local_secure', function() { + $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', 's3', 'filesystems.attachments', 's3'); + $this->checkEnvConfigResult('STORAGE_ATTACHMENT_TYPE', null, 'filesystems.attachments', 'local_secure'); + }); } public function test_app_url_blank_if_old_default_value() @@ -38,6 +37,28 @@ class ConfigTest extends TestCase $this->checkEnvConfigResult('APP_URL', $oldDefault, 'app.url', ''); } + public function test_errorlog_plain_webserver_channel() + { + // We can't full test this due to it being targeted for the SAPI logging handler + // so we just overwrite that component so we can capture the error log output. + config()->set([ + 'logging.channels.errorlog_plain_webserver.handler_with' => [0], + ]); + + $temp = tempnam(sys_get_temp_dir(), 'bs-test'); + $original = ini_set( 'error_log', $temp); + + Log::channel('errorlog_plain_webserver')->info('Aww, look, a cute puppy'); + + ini_set( 'error_log', $original); + + $output = file_get_contents($temp); + $this->assertStringContainsString('Aww, look, a cute puppy', $output); + $this->assertStringNotContainsString('INFO', $output); + $this->assertStringNotContainsString('info', $output); + $this->assertStringNotContainsString('testing', $output); + } + /** * Set an environment variable of the given name and value * then check the given config key to see if it matches the given result. @@ -49,12 +70,9 @@ class ConfigTest extends TestCase */ protected function checkEnvConfigResult(string $envName, $envVal, string $configKey, string $expectedResult) { - $originalVal = getenv($envName); - $envString = $envName . (is_null($envVal) ? '' : '=') . ($envVal ?? ''); - putenv($envString); - $this->refreshApplication(); - $this->assertEquals($expectedResult, config($configKey)); - putenv($envString = $envName . (empty($originalVal) ? '' : '=') . ($originalVal ?? '')); + $this->runWithEnv($envName, $envVal, function() use ($configKey, $expectedResult) { + $this->assertEquals($expectedResult, config($configKey)); + }); } } \ No newline at end of file