NOW MANAGED ON CODEBERG
Theme System: Split & organised tests, changed module version to string
Dan Browncd84074cdf80
diff --git a/app/Theming/ThemeModule.php b/app/Theming/ThemeModule.phpindex 9bbc0103a..f873ed247 100644--- a/app/Theming/ThemeModule.php+++ b/app/Theming/ThemeModule.php@@ -9,7 +9,7 @@ class ThemeModuleprotected string $name;protected string $description;protected string $folderName;- protected int $version;+ protected string $version;/*** Create a ThemeModule instance from JSON data.@@ -26,10 +26,14 @@ class ThemeModulethrow new ThemeException("Module in folder \"{$folderName}\" is missing a valid 'description' property");}- if (!isset($data['version']) || !is_int($data['version']) || $data['version'] < 1) {+ if (!isset($data['version']) || !is_string($data['version'])) {throw new ThemeException("Module in folder \"{$folderName}\" is missing a valid 'version' property");}+ if (!preg_match('/^v?\d+\.\d+\.\d+(-.*)?$/', $data['version'])) {+ throw new ThemeException("Module in folder \"{$folderName}\" has an invalid 'version' format. Expected semantic version format like '1.0.0' or 'v1.0.0'");+ }+$module = new static();$module->name = $data['name'];$module->description = $data['description'];diff --git a/tests/TestCase.php b/tests/TestCase.phpindex f69f20d4c..c6f811b31 100644--- a/tests/TestCase.php+++ b/tests/TestCase.php@@ -13,6 +13,7 @@ use Illuminate\Foundation\Testing\TestCase as BaseTestCase;use Illuminate\Http\JsonResponse;use Illuminate\Support\Env;use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\File;use Illuminate\Support\Facades\Log;use Illuminate\Testing\Assert as PHPUnit;use Illuminate\Testing\Constraints\HasInDatabase;@@ -157,6 +158,23 @@ abstract class TestCase extends BaseTestCase}}+ protected function usingThemeFolder(callable $callback): void+ {+ // Create a folder and configure a theme+ $themeFolderName = 'testing_theme_' . str_shuffle(rtrim(base64_encode(time()), '='));+ config()->set('view.theme', $themeFolderName);+ $themeFolderPath = theme_path('');++ // Create a theme folder and clean it up on application tear-down+ File::makeDirectory($themeFolderPath);+ $this->beforeApplicationDestroyed(fn() => File::deleteDirectory($themeFolderPath));++ // Run provided callback with the theme env option set+ $this->runWithEnv(['APP_THEME' => $themeFolderName], function () use ($callback, $themeFolderName) {+ call_user_func($callback, $themeFolderName);+ });+ }+/*** Check the keys and properties in the given map to include* exist, albeit not exclusively, within the map to check.diff --git a/tests/ThemeTest.php b/tests/Theme/LogicalThemeEventsTest.phpsimilarity index 50%rename from tests/ThemeTest.phprename to tests/Theme/LogicalThemeEventsTest.phpindex f640513cf..0a4afd2f4 100644--- a/tests/ThemeTest.php+++ b/tests/Theme/LogicalThemeEventsTest.php@@ -1,6 +1,6 @@<?php-namespace Tests;+namespace Tests\Theme;use BookStack\Activity\ActivityType;use BookStack\Activity\DispatchWebhookJob;@@ -8,64 +8,17 @@ use BookStack\Activity\Models\Webhook;use BookStack\Entities\Models\Book;use BookStack\Entities\Models\Page;use BookStack\Entities\Tools\PageContent;-use BookStack\Exceptions\ThemeException;use BookStack\Facades\Theme;use BookStack\Theming\ThemeEvents;use BookStack\Users\Models\User;-use Illuminate\Console\Command;use Illuminate\Http\Request;use Illuminate\Http\Response;-use Illuminate\Support\Facades\Artisan;-use Illuminate\Support\Facades\File;use League\CommonMark\Environment\Environment;+use Tests\TestCase;-class ThemeTest extends TestCase+class LogicalThemeEventsTest extends TestCase{- protected string $themeFolderName;- protected string $themeFolderPath;-- public function test_translation_text_can_be_overridden_via_theme()- {- $this->usingThemeFolder(function () {- $translationPath = theme_path('/lang/en');- File::makeDirectory($translationPath, 0777, true);-- $customTranslations = '<?php- return [\'books\' => \'Sandwiches\'];- ';- file_put_contents($translationPath . '/entities.php', $customTranslations);-- $homeRequest = $this->actingAs($this->users->viewer())->get('/');- $this->withHtml($homeRequest)->assertElementContains('header nav', 'Sandwiches');- });- }-- public function test_theme_functions_file_used_and_app_boot_event_runs()- {- $this->usingThemeFolder(function ($themeFolder) {- $functionsFile = theme_path('functions.php');- app()->alias('cat', 'dog');- file_put_contents($functionsFile, "<?php\nTheme::listen(\BookStack\Theming\ThemeEvents::APP_BOOT, function(\$app) { \$app->alias('cat', 'dog');});");- $this->runWithEnv(['APP_THEME' => $themeFolder], function () {- $this->assertEquals('cat', $this->app->getAlias('dog'));- });- });- }-- public function test_theme_functions_loads_errors_are_caught_and_logged()- {- $this->usingThemeFolder(function ($themeFolder) {- $functionsFile = theme_path('functions.php');- file_put_contents($functionsFile, "<?php\n\\BookStack\\Biscuits::eat();");-- $this->expectException(ThemeException::class);- $this->expectExceptionMessageMatches('/Failed loading theme functions file at ".*?" with error: Class "BookStack\\\\Biscuits" not found/');-- $this->runWithEnv(['APP_THEME' => $themeFolder], fn() => null);- });- }-- public function test_event_commonmark_environment_configure()+ public function test_commonmark_environment_configure(){$callbackCalled = false;$callback = function ($environment) use (&$callbackCalled) {@@ -83,7 +36,7 @@ class ThemeTest extends TestCase$this->assertTrue($callbackCalled);}- public function test_event_web_middleware_before()+ public function test_web_middleware_before(){$callbackCalled = false;$requestParam = null;@@ -100,7 +53,7 @@ class ThemeTest extends TestCase$this->assertEquals('cat', $requestParam->header('donkey'));}- public function test_event_web_middleware_before_return_val_used_as_response()+ public function test_web_middleware_before_return_val_used_as_response(){$callback = function (Request $request) {return response('cat', 412);@@ -112,7 +65,7 @@ class ThemeTest extends TestCase$resp->assertStatus(412);}- public function test_event_web_middleware_after()+ public function test_web_middleware_after(){$callbackCalled = false;$requestParam = null;@@ -133,7 +86,7 @@ class ThemeTest extends TestCase$resp->assertHeader('donkey', 'cat123');}- public function test_event_web_middleware_after_return_val_used_as_response()+ public function test_web_middleware_after_return_val_used_as_response(){$callback = function () {return response('cat456', 443);@@ -146,7 +99,7 @@ class ThemeTest extends TestCase$resp->assertStatus(443);}- public function test_event_auth_login_standard()+ public function test_auth_login_standard(){$args = [];$callback = function (...$eventArgs) use (&$args) {@@ -161,7 +114,7 @@ class ThemeTest extends TestCase$this->assertInstanceOf(User::class, $args[1]);}- public function test_event_auth_register_standard()+ public function test_auth_register_standard(){$args = [];$callback = function (...$eventArgs) use (&$args) {@@ -178,7 +131,7 @@ class ThemeTest extends TestCase$this->assertInstanceOf(User::class, $args[1]);}- public function test_event_auth_pre_register()+ public function test_auth_pre_register(){$args = [];$callback = function (...$eventArgs) use (&$args) {@@ -200,7 +153,7 @@ class ThemeTest extends TestCase$this->assertDatabaseHas('users', ['email' => $user->email]);}- public function test_event_auth_pre_register_with_false_return_blocks_registration()+ public function test_auth_pre_register_with_false_return_blocks_registration(){$callback = function () {return false;@@ -215,7 +168,7 @@ class ThemeTest extends TestCase$this->assertDatabaseMissing('users', ['email' => $user->email]);}- public function test_event_webhook_call_before()+ public function test_webhook_call_before(){$args = [];$callback = function (...$eventArgs) use (&$args) {@@ -245,7 +198,7 @@ class ThemeTest extends TestCase$this->assertEquals('hello!', $reqData['test']);}- public function test_event_activity_logged()+ public function test_activity_logged(){$book = $this->entities->book();$args = [];@@ -262,7 +215,7 @@ class ThemeTest extends TestCase$this->assertEquals($book->id, $args[1]->id);}- public function test_event_page_include_parse()+ public function test_page_include_parse(){/** @var Page $page *//** @var Page $otherPage */@@ -293,7 +246,7 @@ class ThemeTest extends TestCase$this->assertEquals($otherPage->id, $args[3]->id);}- public function test_event_routes_register_web_and_web_auth()+ public function test_routes_register_web_and_web_auth(){$functionsContent = <<<'END'<?php@@ -327,172 +280,7 @@ END;});}- public function test_add_social_driver()- {- Theme::addSocialDriver('catnet', [- 'client_id' => 'abc123',- 'client_secret' => 'def456',- ], 'SocialiteProviders\Discord\DiscordExtendSocialite@handleTesting');-- $this->assertEquals('catnet', config('services.catnet.name'));- $this->assertEquals('abc123', config('services.catnet.client_id'));- $this->assertEquals(url('/login/service/catnet/callback'), config('services.catnet.redirect'));-- $loginResp = $this->get('/login');- $loginResp->assertSee('login/service/catnet');- }-- public function test_add_social_driver_uses_name_in_config_if_given()- {- Theme::addSocialDriver('catnet', [- 'client_id' => 'abc123',- 'client_secret' => 'def456',- 'name' => 'Super Cat Name',- ], 'SocialiteProviders\Discord\DiscordExtendSocialite@handleTesting');-- $this->assertEquals('Super Cat Name', config('services.catnet.name'));- $loginResp = $this->get('/login');- $loginResp->assertSee('Super Cat Name');- }-- public function test_add_social_driver_allows_a_configure_for_redirect_callback_to_be_passed()- {- Theme::addSocialDriver(- 'discord',- [- 'client_id' => 'abc123',- 'client_secret' => 'def456',- 'name' => 'Super Cat Name',- ],- 'SocialiteProviders\Discord\DiscordExtendSocialite@handle',- function ($driver) {- $driver->with(['donkey' => 'donut']);- }- );-- $loginResp = $this->get('/login/service/discord');- $redirect = $loginResp->headers->get('location');- $this->assertStringContainsString('donkey=donut', $redirect);- }-- public function test_register_command_allows_provided_command_to_be_usable_via_artisan()- {- Theme::registerCommand(new MyCustomCommand());-- Artisan::call('bookstack:test-custom-command', []);- $output = Artisan::output();-- $this->assertStringContainsString('Command ran!', $output);- }-- public function test_base_body_start_and_end_template_files_can_be_used()- {- $bodyStartStr = 'barry-fought-against-the-panther';- $bodyEndStr = 'barry-lost-his-fight-with-grace';-- $this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr) {- $viewDir = theme_path('layouts/parts');- mkdir($viewDir, 0777, true);- file_put_contents($viewDir . '/base-body-start.blade.php', $bodyStartStr);- file_put_contents($viewDir . '/base-body-end.blade.php', $bodyEndStr);-- $resp = $this->asEditor()->get('/');- $resp->assertSee($bodyStartStr);- $resp->assertSee($bodyEndStr);- });- }-- public function test_export_body_start_and_end_template_files_can_be_used()- {- $bodyStartStr = 'garry-fought-against-the-panther';- $bodyEndStr = 'garry-lost-his-fight-with-grace';- $page = $this->entities->page();-- $this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr, $page) {- $viewDir = theme_path('layouts/parts');- mkdir($viewDir, 0777, true);- file_put_contents($viewDir . '/export-body-start.blade.php', $bodyStartStr);- file_put_contents($viewDir . '/export-body-end.blade.php', $bodyEndStr);-- $resp = $this->asEditor()->get($page->getUrl('/export/html'));- $resp->assertSee($bodyStartStr);- $resp->assertSee($bodyEndStr);- });- }-- public function test_login_and_register_message_template_files_can_be_used()- {- $loginMessage = 'Welcome to this instance, login below you scallywag';- $registerMessage = 'You want to register? Enter the deets below you numpty';-- $this->usingThemeFolder(function (string $folder) use ($loginMessage, $registerMessage) {- $viewDir = theme_path('auth/parts');- mkdir($viewDir, 0777, true);- file_put_contents($viewDir . '/login-message.blade.php', $loginMessage);- file_put_contents($viewDir . '/register-message.blade.php', $registerMessage);- $this->setSettings(['registration-enabled' => 'true']);-- $this->get('/login')->assertSee($loginMessage);- $this->get('/register')->assertSee($registerMessage);- });- }-- public function test_header_links_start_template_file_can_be_used()- {- $content = 'This is added text in the header bar';-- $this->usingThemeFolder(function (string $folder) use ($content) {- $viewDir = theme_path('layouts/parts');- mkdir($viewDir, 0777, true);- file_put_contents($viewDir . '/header-links-start.blade.php', $content);- $this->setSettings(['registration-enabled' => 'true']);-- $this->get('/login')->assertSee($content);- });- }-- public function test_custom_settings_category_page_can_be_added_via_view_file()- {- $content = 'My SuperCustomSettings';-- $this->usingThemeFolder(function (string $folder) use ($content) {- $viewDir = theme_path('settings/categories');- mkdir($viewDir, 0777, true);- file_put_contents($viewDir . '/beans.blade.php', $content);-- $this->asAdmin()->get('/settings/beans')->assertSee($content);- });- }-- public function test_public_folder_contents_accessible_via_route()- {- $this->usingThemeFolder(function (string $themeFolderName) {- $publicDir = theme_path('public');- mkdir($publicDir, 0777, true);-- $text = 'some-text ' . md5(random_bytes(5));- $css = "body { background-color: tomato !important; }";- file_put_contents("{$publicDir}/file.txt", $text);- file_put_contents("{$publicDir}/file.css", $css);- copy($this->files->testFilePath('test-image.png'), "{$publicDir}/image.png");-- $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.txt");- $resp->assertStreamedContent($text);- $resp->assertHeader('Content-Type', 'text/plain; charset=utf-8');- $resp->assertHeader('Cache-Control', 'max-age=86400, private');-- $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/image.png");- $resp->assertHeader('Content-Type', 'image/png');- $resp->assertHeader('Cache-Control', 'max-age=86400, private');-- $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.css");- $resp->assertStreamedContent($css);- $resp->assertHeader('Content-Type', 'text/css; charset=utf-8');- $resp->assertHeader('Cache-Control', 'max-age=86400, private');- });- }-- public function test_theme_register_views_event_to_insert_views_before_and_after()+ public function test_register_views_to_insert_views_before_and_after(){$this->usingThemeFolder(function (string $folder) {$before = 'this-is-my-before-header-string';@@ -530,31 +318,4 @@ CONTENT;$this->artisan('view:clear');}-- protected function usingThemeFolder(callable $callback)- {- // Create a folder and configure a theme- $themeFolderName = 'testing_theme_' . str_shuffle(rtrim(base64_encode(time()), '='));- config()->set('view.theme', $themeFolderName);- $themeFolderPath = theme_path('');-- // Create theme folder and clean it up on application tear-down- File::makeDirectory($themeFolderPath);- $this->beforeApplicationDestroyed(fn() => File::deleteDirectory($themeFolderPath));-- // Run provided callback with theme env option set- $this->runWithEnv(['APP_THEME' => $themeFolderName], function () use ($callback, $themeFolderName) {- call_user_func($callback, $themeFolderName);- });- }-}--class MyCustomCommand extends Command-{- protected $signature = 'bookstack:test-custom-command';-- public function handle()- {- $this->line('Command ran!');- }}diff --git a/tests/Theme/LogicalThemeTest.php b/tests/Theme/LogicalThemeTest.phpnew file mode 100644index 000000000..feb1c7ea7--- /dev/null+++ b/tests/Theme/LogicalThemeTest.php@@ -0,0 +1,105 @@+<?php++namespace Tests\Theme;++use BookStack\Exceptions\ThemeException;+use BookStack\Facades\Theme;+use Illuminate\Console\Command;+use Illuminate\Support\Facades\Artisan;+use Tests\TestCase;++class LogicalThemeTest extends TestCase+{+ public function test_theme_functions_file_used_and_app_boot_event_runs()+ {+ $this->usingThemeFolder(function ($themeFolder) {+ $functionsFile = theme_path('functions.php');+ app()->alias('cat', 'dog');+ file_put_contents($functionsFile, "<?php\nTheme::listen(\BookStack\Theming\ThemeEvents::APP_BOOT, function(\$app) { \$app->alias('cat', 'dog');});");+ $this->runWithEnv(['APP_THEME' => $themeFolder], function () {+ $this->assertEquals('cat', $this->app->getAlias('dog'));+ });+ });+ }++ public function test_theme_functions_loads_errors_are_caught_and_logged()+ {+ $this->usingThemeFolder(function ($themeFolder) {+ $functionsFile = theme_path('functions.php');+ file_put_contents($functionsFile, "<?php\n\\BookStack\\Biscuits::eat();");++ $this->expectException(ThemeException::class);+ $this->expectExceptionMessageMatches('/Failed loading theme functions file at ".*?" with error: Class "BookStack\\\\Biscuits" not found/');++ $this->runWithEnv(['APP_THEME' => $themeFolder], fn() => null);+ });+ }++ public function test_add_social_driver()+ {+ Theme::addSocialDriver('catnet', [+ 'client_id' => 'abc123',+ 'client_secret' => 'def456',+ ], 'SocialiteProviders\Discord\DiscordExtendSocialite@handleTesting');++ $this->assertEquals('catnet', config('services.catnet.name'));+ $this->assertEquals('abc123', config('services.catnet.client_id'));+ $this->assertEquals(url('/login/service/catnet/callback'), config('services.catnet.redirect'));++ $loginResp = $this->get('/login');+ $loginResp->assertSee('login/service/catnet');+ }++ public function test_add_social_driver_uses_name_in_config_if_given()+ {+ Theme::addSocialDriver('catnet', [+ 'client_id' => 'abc123',+ 'client_secret' => 'def456',+ 'name' => 'Super Cat Name',+ ], 'SocialiteProviders\Discord\DiscordExtendSocialite@handleTesting');++ $this->assertEquals('Super Cat Name', config('services.catnet.name'));+ $loginResp = $this->get('/login');+ $loginResp->assertSee('Super Cat Name');+ }++ public function test_add_social_driver_allows_a_configure_for_redirect_callback_to_be_passed()+ {+ Theme::addSocialDriver(+ 'discord',+ [+ 'client_id' => 'abc123',+ 'client_secret' => 'def456',+ 'name' => 'Super Cat Name',+ ],+ 'SocialiteProviders\Discord\DiscordExtendSocialite@handle',+ function ($driver) {+ $driver->with(['donkey' => 'donut']);+ }+ );++ $loginResp = $this->get('/login/service/discord');+ $redirect = $loginResp->headers->get('location');+ $this->assertStringContainsString('donkey=donut', $redirect);+ }++ public function test_register_command_allows_provided_command_to_be_usable_via_artisan()+ {+ Theme::registerCommand(new MyCustomCommand());++ Artisan::call('bookstack:test-custom-command', []);+ $output = Artisan::output();++ $this->assertStringContainsString('Command ran!', $output);+ }+}++class MyCustomCommand extends Command+{+ protected $signature = 'bookstack:test-custom-command';++ public function handle()+ {+ $this->line('Command ran!');+ }+}diff --git a/tests/Theme/VisualThemeTest.php b/tests/Theme/VisualThemeTest.phpnew file mode 100644index 000000000..c06807d7f--- /dev/null+++ b/tests/Theme/VisualThemeTest.php@@ -0,0 +1,132 @@+<?php++namespace Tests\Theme;++use Illuminate\Support\Facades\File;+use Tests\TestCase;++class VisualThemeTest extends TestCase+{+ public function test_translation_text_can_be_overridden_via_theme()+ {+ $this->usingThemeFolder(function () {+ $translationPath = theme_path('/lang/en');+ File::makeDirectory($translationPath, 0777, true);++ $customTranslations = '<?php+ return [\'books\' => \'Sandwiches\'];+ ';+ file_put_contents($translationPath . '/entities.php', $customTranslations);++ $homeRequest = $this->actingAs($this->users->viewer())->get('/');+ $this->withHtml($homeRequest)->assertElementContains('header nav', 'Sandwiches');+ });+ }++ public function test_custom_settings_category_page_can_be_added_via_view_file()+ {+ $content = 'My SuperCustomSettings';++ $this->usingThemeFolder(function (string $folder) use ($content) {+ $viewDir = theme_path('settings/categories');+ mkdir($viewDir, 0777, true);+ file_put_contents($viewDir . '/beans.blade.php', $content);++ $this->asAdmin()->get('/settings/beans')->assertSee($content);+ });+ }++ public function test_base_body_start_and_end_template_files_can_be_used()+ {+ $bodyStartStr = 'barry-fought-against-the-panther';+ $bodyEndStr = 'barry-lost-his-fight-with-grace';++ $this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr) {+ $viewDir = theme_path('layouts/parts');+ mkdir($viewDir, 0777, true);+ file_put_contents($viewDir . '/base-body-start.blade.php', $bodyStartStr);+ file_put_contents($viewDir . '/base-body-end.blade.php', $bodyEndStr);++ $resp = $this->asEditor()->get('/');+ $resp->assertSee($bodyStartStr);+ $resp->assertSee($bodyEndStr);+ });+ }++ public function test_export_body_start_and_end_template_files_can_be_used()+ {+ $bodyStartStr = 'garry-fought-against-the-panther';+ $bodyEndStr = 'garry-lost-his-fight-with-grace';+ $page = $this->entities->page();++ $this->usingThemeFolder(function (string $folder) use ($bodyStartStr, $bodyEndStr, $page) {+ $viewDir = theme_path('layouts/parts');+ mkdir($viewDir, 0777, true);+ file_put_contents($viewDir . '/export-body-start.blade.php', $bodyStartStr);+ file_put_contents($viewDir . '/export-body-end.blade.php', $bodyEndStr);++ $resp = $this->asEditor()->get($page->getUrl('/export/html'));+ $resp->assertSee($bodyStartStr);+ $resp->assertSee($bodyEndStr);+ });+ }++ public function test_login_and_register_message_template_files_can_be_used()+ {+ $loginMessage = 'Welcome to this instance, login below you scallywag';+ $registerMessage = 'You want to register? Enter the deets below you numpty';++ $this->usingThemeFolder(function (string $folder) use ($loginMessage, $registerMessage) {+ $viewDir = theme_path('auth/parts');+ mkdir($viewDir, 0777, true);+ file_put_contents($viewDir . '/login-message.blade.php', $loginMessage);+ file_put_contents($viewDir . '/register-message.blade.php', $registerMessage);+ $this->setSettings(['registration-enabled' => 'true']);++ $this->get('/login')->assertSee($loginMessage);+ $this->get('/register')->assertSee($registerMessage);+ });+ }++ public function test_header_links_start_template_file_can_be_used()+ {+ $content = 'This is added text in the header bar';++ $this->usingThemeFolder(function (string $folder) use ($content) {+ $viewDir = theme_path('layouts/parts');+ mkdir($viewDir, 0777, true);+ file_put_contents($viewDir . '/header-links-start.blade.php', $content);+ $this->setSettings(['registration-enabled' => 'true']);++ $this->get('/login')->assertSee($content);+ });+ }++ public function test_public_folder_contents_accessible_via_route()+ {+ $this->usingThemeFolder(function (string $themeFolderName) {+ $publicDir = theme_path('public');+ mkdir($publicDir, 0777, true);++ $text = 'some-text ' . md5(random_bytes(5));+ $css = "body { background-color: tomato !important; }";+ file_put_contents("{$publicDir}/file.txt", $text);+ file_put_contents("{$publicDir}/file.css", $css);+ copy($this->files->testFilePath('test-image.png'), "{$publicDir}/image.png");++ $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.txt");+ $resp->assertStreamedContent($text);+ $resp->assertHeader('Content-Type', 'text/plain; charset=utf-8');+ $resp->assertHeader('Cache-Control', 'max-age=86400, private');++ $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/image.png");+ $resp->assertHeader('Content-Type', 'image/png');+ $resp->assertHeader('Cache-Control', 'max-age=86400, private');++ $resp = $this->asAdmin()->get("/theme/{$themeFolderName}/file.css");+ $resp->assertStreamedContent($css);+ $resp->assertHeader('Content-Type', 'text/css; charset=utf-8');+ $resp->assertHeader('Cache-Control', 'max-age=86400, private');+ });+ }+}