webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-10-13 11:47:56 +03:00
Code Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Dan Brown
2021-06-26 15:23:15 +00:00
committed by StyleCI Bot
parent 3a402f6adc
commit 934a833818
349 changed files with 3655 additions and 2625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/Unit/ConfigTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace Tests\Unit;
<?php
namespace Tests\Unit;
use Illuminate\Support\Facades\Log;
use Tests\TestCase;
@@ -7,15 +9,12 @@ use Tests\TestCase;
* Class ConfigTest
* Many of the tests here are to check on tweaks made
* to maintain backwards compatibility.
*
* @package Tests
*/
class ConfigTest extends TestCase
{
public function test_filesystem_images_falls_back_to_storage_type_var()
{
$this->runWithEnv('STORAGE_TYPE', 'local_secure', function() {
$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');
});
@@ -23,7 +22,7 @@ class ConfigTest extends TestCase
public function test_filesystem_attachments_falls_back_to_storage_type_var()
{
$this->runWithEnv('STORAGE_TYPE', 'local_secure', function() {
$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');
});
@@ -46,11 +45,11 @@ class ConfigTest extends TestCase
]);
$temp = tempnam(sys_get_temp_dir(), 'bs-test');
$original = ini_set( 'error_log', $temp);
$original = ini_set('error_log', $temp);
Log::channel('errorlog_plain_webserver')->info('Aww, look, a cute puppy');
ini_set( 'error_log', $original);
ini_set('error_log', $original);
$output = file_get_contents($temp);
$this->assertStringContainsString('Aww, look, a cute puppy', $output);
@@ -81,13 +80,13 @@ class ConfigTest extends TestCase
* Set an environment variable of the given name and value
* then check the given config key to see if it matches the given result.
* Providing a null $envVal clears the variable.
*
* @param mixed $expectedResult
*/
protected function checkEnvConfigResult(string $envName, ?string $envVal, string $configKey, $expectedResult)
{
$this->runWithEnv($envName, $envVal, function() use ($configKey, $expectedResult) {
$this->runWithEnv($envName, $envVal, function () use ($configKey, $expectedResult) {
$this->assertEquals($expectedResult, config($configKey));
});
}
}
}

12
tests/Unit/UrlTest.php
View File

@@ -1,22 +1,22 @@
<?php namespace Tests\Unit;
<?php
namespace Tests\Unit;
use Tests\TestCase;
class UrlTest extends TestCase
{
public function test_url_helper_takes_custom_url_into_account()
{
$this->runWithEnv('APP_URL', 'http://example.com/bookstack', function() {
$this->runWithEnv('APP_URL', 'http://example.com/bookstack', function () {
$this->assertEquals('http://example.com/bookstack/books', url('/books'));
});
}
public function test_url_helper_sets_correct_scheme_even_when_request_scheme_is_different()
{
$this->runWithEnv('APP_URL', 'https://example.com/', function() {
$this->runWithEnv('APP_URL', 'https://example.com/', function () {
$this->get('http://example.com/login')->assertSee('https://example.com/dist/styles.css');
});
}
}
}