github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-04 17:04:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allowed different storage types for images and attachments

Browse Source 
- Added new env and config vars to allow this.
- Also added tests for awkward config logic including fallback for new
env vars.

Closes #1302
This commit is contained in:
Dan Brown
2019-06-23 16:01:15 +01:00
parent bf1371d04c
commit 762d1d7595
7 changed files with 79 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/Unit/ConfigTest.php Normal file
View File

@ -0,0 +1,54 @@
<?php namespace Tests;
/**
* 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()
{
putenv('STORAGE_TYPE=local_secure');
$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');
}
public function test_app_url_blank_if_old_default_value()
{
$initUrl = 'https://example.com/docs';
$oldDefault = 'http://bookstack.dev';
$this->checkEnvConfigResult('APP_URL', $initUrl, 'app.url', $initUrl);
$this->checkEnvConfigResult('APP_URL', $oldDefault, 'app.url', '');
}
/**
* 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 string $envName
* @param string|null $envVal
* @param string $configKey
* @param string $expectedResult
*/
protected function checkEnvConfigResult(string $envName, $envVal, string $configKey, string $expectedResult)
{
$envString = $envName . (is_null($envVal) ? '' : '=') . ($envVal ?? '');
putenv($envString);
$this->refreshApplication();
$this->assertEquals($expectedResult, config($configKey));
}
}

6
tests/Uploads/ImageTest.php
View File

@ -176,7 +176,7 @@ class ImageTest extends TestCase
public function test_secure_images_uploads_to_correct_place()
{
config()->set('filesystems.default', 'local_secure');
config()->set('filesystems.images', 'local_secure');
$this->asEditor();
$galleryFile = $this->getTestImage('my-secure-test-upload.png');
$page = Page::first();
@ -194,7 +194,7 @@ class ImageTest extends TestCase
public function test_secure_images_included_in_exports()
{
config()->set('filesystems.default', 'local_secure');
config()->set('filesystems.images', 'local_secure');
$this->asEditor();
$galleryFile = $this->getTestImage('my-secure-test-upload.png');
$page = Page::first();
@ -217,7 +217,7 @@ class ImageTest extends TestCase
public function test_system_images_remain_public()
{
config()->set('filesystems.default', 'local_secure');
config()->set('filesystems.images', 'local_secure');
$this->asAdmin();
$galleryFile = $this->getTestImage('my-system-test-upload.png');
$expectedPath = public_path('uploads/images/system/' . Date('Y-m') . '/my-system-test-upload.png');