{{ $searchTitle }}
+ +
+
+@endsection
diff --git a/packages/framework/resources/views/pages/documentation-search.blade.php b/packages/framework/resources/views/pages/documentation-search.blade.php
deleted file mode 100644
index 8eed2b28948..00000000000
--- a/packages/framework/resources/views/pages/documentation-search.blade.php
+++ /dev/null
@@ -1,14 +0,0 @@
-@extends('hyde::layouts.docs')
-@section('content')
- Search the documentation site
- -- ');
- if ($position === false) {
- // The document has no headings, so we'll just return an empty string.
- return '';
+ return [
+ 'level' => $headingData['level'],
+ 'title' => $headingData['title'],
+ 'identifier' => HeadingRenderer::makeIdentifier($headingData['title']),
+ ];
+ }
+
+ /**
+ * @param array
-
+
+ #
+ Level 2
+
+
-
+
- + + # + Level 3 + + +
+ - + + # + Level 2 + + +
- + + # + Level 2B + + +
-
+
-
+
-
+
+ #
+ Level 3
+
+
-
+
- + + # + Level 4 + + +
+
+ -
+
+ #
+ Level 3
+
+
- + + # + Level 2 + + +
-
+
-
+
- + + # + Level 3B + + +
+ -
+
+ #
+ Level 2
+
+
-
+
- + + # + Level 3 + + +
+ -
+
+ #
+ Level 2
+
+
-
+
-
+
+ #
+ Level 3
+
+
-
+
- + + # + Level 4 + + +
+
+ -
+
+ #
+ Level 3
+
+
-
+
+ #
+ Level 2B
+
+
-
+
- + + # + Level 3B + + +
- + + # + Level 3C + + +
+ -
+
+ #
+ Level 2C
+
+
-
+
- + + # + Level 3D + + +
+ -
+
+ #
+ Level 2
+
+
-
+
- + + # + Level 3 + + +
+ -
+
+ #
+ Level 2B
+
+
-
+
- + + # + Level 3B + + +
+
1
+ Filepath: foo.html1 Filepath: $escaped
+ Filepath: $escapedFilepath: LinkFilepath: LinkThis is a regular link with no Hyde syntax.
'; + + $this->assertSame($input, DynamicMarkdownLinkProcessor::postprocess($input)); + } + + public function testNestedRouteReplacement() + { + $input = ''; + $expected = ''; + + $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input)); + } + + // Fault tolerance tests + + public function testNonExistentRouteIsNotReplaced() + { + $input = ''; + $expected = ''; + + $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input)); + } + + public function testNonExistentAssetIsNotReplaced() + { + $input = '
+ HTML;
+
+ $expected = <<<'HTML'
+ Valid Home
+ Invalid Route
+
+ HTML;
+
+ $this->assertSame($expected, DynamicMarkdownLinkProcessor::postprocess($input));
+ }
+
+ public function testResetAssetMapCache()
+ {
+ DynamicMarkdownLinkProcessor::resetAssetMapCache();
+
+ $this->assertTrue(true);
+ }
+}
diff --git a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
index 12660727644..b7ff55d50eb 100644
--- a/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
+++ b/packages/framework/tests/Feature/Services/Markdown/ShortcodeProcessorTest.php
@@ -7,12 +7,24 @@
use Hyde\Markdown\Contracts\MarkdownShortcodeContract;
use Hyde\Markdown\Processing\ShortcodeProcessor;
use Hyde\Testing\UnitTestCase;
+use Hyde\Testing\UsesRealBladeInUnitTests;
/**
* @covers \Hyde\Markdown\Processing\ShortcodeProcessor
*/
class ShortcodeProcessorTest extends UnitTestCase
{
+ use UsesRealBladeInUnitTests;
+
+ protected static bool $needsKernel = true;
+ protected static bool $needsConfig = true;
+
+ protected function setUp(): void
+ {
+ self::mockCurrentRouteKey('foo');
+ $this->createRealBladeCompilerEnvironment();
+ }
+
public function testConstructorDiscoversDefaultShortcodes()
{
$shortcodes = (new ShortcodeProcessor('foo'))->getShortcodes();
@@ -25,7 +37,11 @@ public function testDiscoveredShortcodesAreUsedToProcessInput()
{
$processor = new ShortcodeProcessor('>info foo');
- $this->assertSame('', $processor->run()); + $this->assertSame(<<<'HTML' +foo
++ HTML, $processor->run()); } public function testStringWithoutShortcodeIsNotModified() @@ -38,8 +54,11 @@ public function testStringWithoutShortcodeIsNotModified() public function testProcessStaticShorthand() { $this->assertSame( - 'foo
+
', - ShortcodeProcessor::preprocess('>info foo') + <<<'HTML' +foo
++ HTML, ShortcodeProcessor::preprocess('>info foo') ); } diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php index 3dec761d585..72f291eaaa4 100644 --- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php +++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php @@ -86,6 +86,8 @@ public function testXmlChannelDataCanBeCustomized() public function testMarkdownBlogPostsAreAddedToRssFeedThroughAutodiscovery() { + config(['hyde.cache_busting' => false]); + file_put_contents(Hyde::path('_posts/rss.md'), <<<'MD' --- title: RSS @@ -143,17 +145,16 @@ public function testGenerateFeedHelperReturnsXmlString() public function testCanGenerateFeedHelperReturnsTrueIfHydeHasBaseUrl() { config(['hyde.url' => 'foo']); - $this->file('_posts/foo.md'); - $this->assertTrue(Features::rss()); + $this->file('_posts/foo.md'); + $this->assertTrue(Features::hasRss()); } public function testCanGenerateFeedHelperReturnsFalseIfHydeDoesNotHaveBaseUrl() { $this->withoutSiteUrl(); $this->file('_posts/foo.md'); - - $this->assertFalse(Features::rss()); + $this->assertFalse(Features::hasRss()); } public function testCanGenerateFeedHelperReturnsFalseIfFeedsAreDisabledInConfig() @@ -161,6 +162,6 @@ public function testCanGenerateFeedHelperReturnsFalseIfFeedsAreDisabledInConfig( config(['hyde.url' => 'foo']); config(['hyde.rss.enabled' => false]); - $this->assertFalse(Features::rss()); + $this->assertFalse(Features::hasRss()); } } diff --git a/packages/framework/tests/Feature/Services/SitemapServiceTest.php b/packages/framework/tests/Feature/Services/SitemapServiceTest.php index 417c979e70f..c19d8a0055a 100644 --- a/packages/framework/tests/Feature/Services/SitemapServiceTest.php +++ b/packages/framework/tests/Feature/Services/SitemapServiceTest.php @@ -71,6 +71,7 @@ public function testGenerateAddsMarkdownPostsToXml() public function testGenerateAddsDocumentationPagesToXml() { + $this->withoutDocumentationSearch(); Filesystem::touch('_docs/foo.md'); $service = new SitemapGenerator(); @@ -78,6 +79,19 @@ public function testGenerateAddsDocumentationPagesToXml() $this->assertCount(3, $service->getXmlElement()->url); + Filesystem::unlink('_docs/foo.md'); + $this->restoreDocumentationSearch(); + } + + public function test_generate_adds_documentation_search_pages_to_xml() + { + Filesystem::touch('_docs/foo.md'); + + $service = new SitemapGenerator(); + $service->generate(); + + $this->assertCount(5, $service->getXmlElement()->url); + Filesystem::unlink('_docs/foo.md'); } @@ -140,6 +154,7 @@ public function testAllRouteTypesAreDiscovered() config(['hyde.url' => 'foo']); Filesystem::unlink(['_pages/index.blade.php', '_pages/404.blade.php']); + $this->withoutDocumentationSearch(); $files = [ '_pages/blade.blade.php', @@ -166,6 +181,8 @@ public function testAllRouteTypesAreDiscovered() copy(Hyde::vendorPath('resources/views/homepages/welcome.blade.php'), Hyde::path('_pages/index.blade.php')); copy(Hyde::vendorPath('resources/views/pages/404.blade.php'), Hyde::path('_pages/404.blade.php')); + + $this->restoreDocumentationSearch(); } public function testLinksFallbackToRelativeLinksWhenASiteUrlIsNotSet() diff --git a/packages/framework/tests/Feature/SitemapFeatureTest.php b/packages/framework/tests/Feature/SitemapFeatureTest.php new file mode 100644 index 00000000000..f2a79157fbc --- /dev/null +++ b/packages/framework/tests/Feature/SitemapFeatureTest.php @@ -0,0 +1,157 @@ +makePartial(); + $filesystem->shouldReceive('lastModified')->andReturn(Carbon::now()->timestamp); + File::swap($filesystem); + + $this->cleanUpWhenDone('_site/sitemap.xml'); + $this->setUpBroadSiteStructure(); + $this->withSiteUrl(); + + $this->artisan('build:sitemap') + ->expectsOutputToContain('Created _site/sitemap.xml') + ->assertExitCode(0); + + $this->assertFileExists('_site/sitemap.xml'); + + $this->assertSameXml( + ''."\n{$this->stripFormatting($this->expected(Hyde::version()))}\n", + file_get_contents('_site/sitemap.xml') + ); + } + + protected function setUpBroadSiteStructure(): void + { + $this->file('_pages/about.md', "# About\n\nThis is the about page."); + $this->file('_pages/contact.html', 'foo
+
Contact
This is the contact page.
'); + $this->file('_posts/hello-world.md', "# Hello, World!\n\nThis is the first post."); + $this->file('_posts/second-post.md', "# Second Post\n\nThis is the second post."); + $this->file('_docs/index.md', "# Documentation\n\nThis is the documentation index."); + $this->file('_docs/installation.md', "# Installation\n\nThis is the installation guide."); + $this->file('_docs/usage.md', "# Usage\n\nThis is the usage guide."); + $this->file('_docs/404.md', "# 404\n\nThis is the 404 page."); + } + + protected function expected(string $version): string + { + return <<CHAPTER I. DOWN THE RABBIT-HOLE.
', + 'CHAPTER I. DOWN THE RABBIT-HOLE.#
', 'So she was considering in her own mind, as well as she could', ]); } @@ -55,7 +55,7 @@ public function testCanCompilePageToRootOutputDirectory() $this->inspectHtml([ 'Adventures in Wonderland', - '
CHAPTER I. DOWN THE RABBIT-HOLE.
', + 'CHAPTER I. DOWN THE RABBIT-HOLE.#
', 'So she was considering in her own mind, as well as she could', ], '_site/test-page.html'); } diff --git a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php index 10af1b63700..8269e519dc1 100644 --- a/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php +++ b/packages/framework/tests/Feature/StaticSiteBuilderPostModuleTest.php @@ -23,6 +23,8 @@ protected function setUp(): void { parent::setUp(); + $this->file('_media/image.png'); + $this->post = MarkdownPost::make('test-post', [ 'title' => 'Adventures in Wonderland', 'description' => 'All in the golden afternoon, full leisurely we glide.', @@ -96,7 +98,7 @@ public function testPostContainsExpectedMetaTags() public function testPostContainsExpectedItemprops() { $this->inspectHtml([ - 'itemtype="https://schema.org/Article"', + 'itemtype="https://schema.org/BlogPosting"', 'itemtype="https://schema.org/Person"', 'itemprop="identifier"', 'itemprop="headline"', @@ -119,9 +121,9 @@ public function testPostContainsExpectedAriaSupport() public function testPostImageIsResolvedRelatively() { $this->inspectHtml([ - '', - '', - '', + '', + '', + '', ]); } diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php index 77c75506eb2..fc4449b162f 100644 --- a/packages/framework/tests/Feature/StaticSiteServiceTest.php +++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php @@ -18,6 +18,7 @@ * @covers \Hyde\Console\Commands\BuildSiteCommand * @covers \Hyde\Framework\Services\BuildService * @covers \Hyde\Framework\Actions\PreBuildTasks\CleanSiteDirectory + * @covers \Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets */ class StaticSiteServiceTest extends TestCase { @@ -59,10 +60,12 @@ public function testBuildCommandCreatesHtmlFiles() public function testBuildCommandTransfersMediaAssetFiles() { - file_put_contents(Hyde::path('_media/test-image.png'), 'foo'); - $this->artisan('build'); + $this->file('_media/test-image.png', 'foo'); + $this->artisan('build') + ->expectsOutputToContain('Transferring Media Assets...'); + $this->assertFileEquals(Hyde::path('_media/test-image.png'), Hyde::path('_site/media/test-image.png')); - Filesystem::unlink('_media/test-image.png'); + Filesystem::unlink('_site/media/test-image.png'); } @@ -70,11 +73,41 @@ public function testBuildCommandTransfersMediaAssetFilesRecursively() { $this->directory('_media/foo'); - file_put_contents(Hyde::path('_media/foo/img.png'), 'foo'); + $this->file('_media/foo/img.png', 'foo'); $this->artisan('build')->assertSuccessful(); $this->assertFileEquals(Hyde::path('_media/foo/img.png'), Hyde::path('_site/media/foo/img.png')); } + public function testBuildCommandCreatesNeededMediaDirectoriesRecursively() + { + $this->directory('_media/foo/bar'); + $this->file('_media/1.png'); + $this->file('_media/foo/2.png'); + $this->file('_media/foo/bar/3.png'); + + Filesystem::deleteDirectory('_site'); + + $this->artisan('build') + ->assertExitCode(0); + + $this->assertFileExists(Hyde::path('_site/media/1.png')); + $this->assertFileExists(Hyde::path('_site/media/foo/2.png')); + $this->assertFileExists(Hyde::path('_site/media/foo/bar/3.png')); + } + + public function testBuildCommandSkipsMediaTransferWhenThereAreNoAssets() + { + rename(Hyde::path('_media/app.css'), Hyde::path('_media/app.css.bak')); + + $this->artisan('build') + ->expectsOutputToContain('Transferring Media Assets... ') + ->expectsOutputToContain('Skipped') + ->expectsOutputToContain('> No media files to transfer.') + ->assertExitCode(0); + + rename(Hyde::path('_media/app.css.bak'), Hyde::path('_media/app.css')); + } + public function testAllPageTypesCanBeCompiled() { $this->file('_pages/html.html'); @@ -89,7 +122,6 @@ public function testAllPageTypesCanBeCompiled() ->expectsOutput('Creating Markdown Pages...') ->expectsOutput('Creating Markdown Posts...') ->expectsOutput('Creating Documentation Pages...') - ->doesntExpectOutputToContain('Creating') ->assertExitCode(0); $this->assertFileExists(Hyde::path('_site/html.html')); @@ -97,12 +129,6 @@ public function testAllPageTypesCanBeCompiled() $this->assertFileExists(Hyde::path('_site/markdown.html')); $this->assertFileExists(Hyde::path('_site/posts/post.html')); $this->assertFileExists(Hyde::path('_site/docs/docs.html')); - - Filesystem::unlink('_site/html.html'); - Filesystem::unlink('_site/blade.html'); - Filesystem::unlink('_site/markdown.html'); - Filesystem::unlink('_site/posts/post.html'); - Filesystem::unlink('_site/docs/docs.html'); } public function testOnlyProgressBarsForTypesWithPagesAreShown() @@ -121,8 +147,6 @@ public function testOnlyProgressBarsForTypesWithPagesAreShown() $this->assertFileExists(Hyde::path('_site/blade.html')); $this->assertFileExists(Hyde::path('_site/markdown.html')); - Filesystem::unlink('_site/blade.html'); - Filesystem::unlink('_site/markdown.html'); } public function testPrintInitialInformationAllowsApiToBeDisabled() @@ -136,15 +160,13 @@ public function testNodeActionOutputs() { Process::fake(); - $this->artisan('build --run-prettier --run-dev --run-prod') - ->expectsOutput('Prettifying code! This may take a second.') - ->expectsOutput('Building frontend assets for development! This may take a second.') + $this->artisan('build --run-prettier --run-vite') ->expectsOutput('Building frontend assets for production! This may take a second.') + ->expectsOutput('Prettifying code! This may take a second.') ->assertExitCode(0); + Process::assertRan(fn ($process) => $process->command === 'npm run build'); Process::assertRan(fn ($process) => $process->command === 'npx prettier '.Hyde::pathToRelative(Hyde::sitePath()).'/**/*.html --write --bracket-same-line'); - Process::assertRan(fn ($process) => $process->command === 'npm run dev'); - Process::assertRan(fn ($process) => $process->command === 'npm run prod'); } public function testPrettyUrlsOptionOutput() @@ -369,4 +391,60 @@ public function testSiteOutputDirectoryCanBeChangedInConfiguration() File::deleteDirectory(Hyde::path('_site/build')); } + + public function testAppCssIsTransferredWhenLoadAppStylesFromCdnIsFalse() + { + config(['hyde.load_app_styles_from_cdn' => false]); + + $this->artisan('build')->assertExitCode(0); + + $this->assertFileExists(Hyde::path('_site/media/app.css')); + $this->assertFileEquals(Hyde::path('_media/app.css'), Hyde::path('_site/media/app.css')); + } + + public function testAppCssIsNotTransferredWhenLoadAppStylesFromCdnIsTrue() + { + config(['hyde.load_app_styles_from_cdn' => true]); + + $this->artisan('build')->assertExitCode(0); + + $this->assertFileDoesNotExist(Hyde::path('_site/media/app.css')); + } + + public function testOtherAssetsAreTransferredWhenLoadAppStylesFromCdnIsTrue() + { + config(['hyde.load_app_styles_from_cdn' => true]); + $this->file('_media/image.png', 'fake image data'); + + $this->artisan('build')->assertExitCode(0); + + $this->assertFileDoesNotExist(Hyde::path('_site/media/app.css')); + $this->assertFileExists(Hyde::path('_site/media/image.png')); + $this->assertFileEquals(Hyde::path('_media/image.png'), Hyde::path('_site/media/image.png')); + } + + public function testSkipMessageWhenOnlyAppCssExistsAndLoadAppStylesFromCdnIsTrue() + { + config(['hyde.load_app_styles_from_cdn' => true]); + + $this->artisan('build') + ->expectsOutputToContain('Transferring Media Assets... ') + ->expectsOutputToContain('Skipped') + ->expectsOutputToContain('> No media files to transfer.') + ->assertExitCode(0); + } + + public function testNormalTransferWhenMultipleAssetsExistAndLoadAppStylesFromCdnIsTrue() + { + config(['hyde.load_app_styles_from_cdn' => true]); + $this->file('_media/image.png', 'fake image data'); + + $this->artisan('build') + ->expectsOutputToContain('Transferring Media Assets...') + ->doesntExpectOutputToContain('Skipped') + ->assertExitCode(0); + + $this->assertFileDoesNotExist(Hyde::path('_site/media/app.css')); + $this->assertFileExists(Hyde::path('_site/media/image.png')); + } } diff --git a/packages/framework/tests/Feature/Support/MediaFileTest.php b/packages/framework/tests/Feature/Support/MediaFileTest.php index 0782bfaf3bc..9ed44ccd8e8 100644 --- a/packages/framework/tests/Feature/Support/MediaFileTest.php +++ b/packages/framework/tests/Feature/Support/MediaFileTest.php @@ -4,200 +4,161 @@ namespace Hyde\Framework\Testing\Feature\Support; -use Hyde\Facades\Filesystem; -use Hyde\Framework\Exceptions\FileNotFoundException; use Hyde\Hyde; -use Hyde\Support\Filesystem\MediaFile; use Hyde\Testing\TestCase; +use Illuminate\Support\Str; +use Hyde\Support\Filesystem\MediaFile; +use Hyde\Framework\Exceptions\FileNotFoundException; /** * @covers \Hyde\Support\Filesystem\MediaFile + * + * @see \Hyde\Framework\Testing\Unit\Support\MediaFileUnitTest */ class MediaFileTest extends TestCase { - public function testCanConstruct() + public function testMediaFileCreationAndBasicProperties() { - $file = new MediaFile('foo'); + $this->file('_media/test.txt', 'Hello, World!'); - $this->assertInstanceOf(MediaFile::class, $file); - $this->assertSame('foo', $file->path); - } + $mediaFile = MediaFile::make('test.txt'); - public function testCanMake() - { - $this->assertEquals(new MediaFile('foo'), MediaFile::make('foo')); - } + $this->assertInstanceOf(MediaFile::class, $mediaFile); + $this->assertSame('test.txt', $mediaFile->getName()); + $this->assertSame('_media/test.txt', $mediaFile->getPath()); + $this->assertSame(Hyde::path('_media/test.txt'), $mediaFile->getAbsolutePath()); + $this->assertSame('Hello, World!', $mediaFile->getContents()); + $this->assertSame('txt', $mediaFile->getExtension()); - public function testCanConstructWithNestedPaths() - { - $this->assertSame('path/to/file.txt', MediaFile::make('path/to/file.txt')->path); + $this->assertSame([ + 'name' => 'test.txt', + 'path' => '_media/test.txt', + 'length' => 13, + 'mimeType' => 'text/plain', + 'hash' => 'dffed8e6', + ], $mediaFile->toArray()); } - public function testAbsolutePathIsNormalizedToRelative() + public function testMediaFileDiscovery() { - $this->assertSame('foo', MediaFile::make(Hyde::path('foo'))->path); - } + // App.css is a default file + $this->file('_media/image.png', 'PNG content'); + $this->file('_media/style.css', 'CSS content'); + $this->file('_media/script.js', 'JS content'); - public function testGetNameReturnsNameOfFile() - { - $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getName()); - $this->assertSame('bar.txt', MediaFile::make('foo/bar.txt')->getName()); - } + $allFiles = MediaFile::all(); - public function testGetPathReturnsPathOfFile() - { - $this->assertSame('foo.txt', MediaFile::make('foo.txt')->getPath()); - $this->assertSame('foo/bar.txt', MediaFile::make('foo/bar.txt')->getPath()); - } + $this->assertCount(4, $allFiles); + $this->assertArrayHasKey('image.png', $allFiles); + $this->assertArrayHasKey('style.css', $allFiles); + $this->assertArrayHasKey('script.js', $allFiles); - public function testGetAbsolutePathReturnsAbsolutePathOfFile() - { - $this->assertSame(Hyde::path('foo.txt'), MediaFile::make('foo.txt')->getAbsolutePath()); - $this->assertSame(Hyde::path('foo/bar.txt'), MediaFile::make('foo/bar.txt')->getAbsolutePath()); + $fileNames = MediaFile::files(); + $this->assertEqualsCanonicalizing(['image.png', 'app.css', 'style.css', 'script.js'], $fileNames); } - public function testGetContentsReturnsContentsOfFile() + public function testMediaFileProperties() { - $this->file('foo.txt', 'foo bar'); - $this->assertSame('foo bar', MediaFile::make('foo.txt')->getContents()); - } + $content = str_repeat('a', 1024); // 1KB content + $this->file('_media/large_file.txt', $content); - public function testGetExtensionReturnsExtensionOfFile() - { - $this->file('foo.txt', 'foo'); - $this->assertSame('txt', MediaFile::make('foo.txt')->getExtension()); + $mediaFile = MediaFile::make('large_file.txt'); - $this->file('foo.png', 'foo'); - $this->assertSame('png', MediaFile::make('foo.png')->getExtension()); + $this->assertSame(1024, $mediaFile->getLength()); + $this->assertSame('text/plain', $mediaFile->getMimeType()); + $this->assertSame(hash('crc32', $content), $mediaFile->getHash()); } - public function testToArrayReturnsArrayOfFileProperties() + public function testMediaFilePathHandling() { - $this->file('foo.txt', 'foo bar'); + $this->file('_media/subfolder/nested_file.txt', 'Nested content'); - $this->assertSame([ - 'name' => 'foo.txt', - 'path' => 'foo.txt', - 'length' => 7, - 'mimeType' => 'text/plain', - ], MediaFile::make('foo.txt')->toArray()); + $mediaFile = MediaFile::make('subfolder/nested_file.txt'); + + $this->assertSame('subfolder/nested_file.txt', $mediaFile->getIdentifier()); + $this->assertSame('_media/subfolder/nested_file.txt', $mediaFile->getPath()); } - public function testToArrayWithEmptyFileWithNoExtension() + public function testMediaFileExceptionHandling() { - $this->file('foo', 'foo bar'); - - $this->assertSame([ - 'name' => 'foo', - 'path' => 'foo', - 'length' => 7, - 'mimeType' => 'text/plain', - ], MediaFile::make('foo')->toArray()); + $this->expectException(FileNotFoundException::class); + MediaFile::make('non_existent_file.txt')->getLength(); } - public function testToArrayWithFileInSubdirectory() + public function testMediaDirectoryCustomization() { - mkdir(Hyde::path('foo')); - touch(Hyde::path('foo/bar.txt')); + Hyde::setMediaDirectory('custom_media'); - $this->assertSame([ - 'name' => 'bar.txt', - 'path' => 'foo/bar.txt', - 'length' => 0, - 'mimeType' => 'text/plain', - ], MediaFile::make('foo/bar.txt')->toArray()); + $this->file('custom_media/custom_file.txt', 'Custom content'); - Filesystem::unlink('foo/bar.txt'); - rmdir(Hyde::path('foo')); - } + $mediaFile = MediaFile::make('custom_file.txt'); - public function testGetContentLength() - { - $this->file('foo', 'Hello World!'); - $this->assertSame(12, MediaFile::make('foo')->getContentLength()); - } + $this->assertSame('custom_media/custom_file.txt', $mediaFile->getPath()); + $this->assertSame(Hyde::path('custom_media/custom_file.txt'), $mediaFile->getAbsolutePath()); - public function testGetContentLengthWithEmptyFile() - { - $this->file('foo', ''); - $this->assertSame(0, MediaFile::make('foo')->getContentLength()); + Hyde::setMediaDirectory('_media'); } - public function testGetContentLengthWithDirectory() + public function testMediaFileOutputPaths() { - $this->directory('foo'); + $this->assertSame(Hyde::path('_site/media'), MediaFile::outputPath()); + $this->assertSame(Hyde::path('_site/media/test.css'), MediaFile::outputPath('test.css')); - $this->expectException(FileNotFoundException::class); - $this->expectExceptionMessage('File [foo] not found.'); + Hyde::setOutputDirectory('custom_output'); + $this->assertSame(Hyde::path('custom_output/media'), MediaFile::outputPath()); - MediaFile::make('foo')->getContentLength(); + Hyde::setOutputDirectory('_site'); } - public function testGetContentLengthWithNonExistentFile() + public function testMediaFileCacheBusting() { - $this->expectException(FileNotFoundException::class); - $this->expectExceptionMessage('File [foo] not found.'); + $this->file('_media/cachebust_test.js', 'console.log("Hello");'); - MediaFile::make('foo')->getContentLength(); - } + $cacheBustKey = Str::after(MediaFile::make('cachebust_test.js')->getLink(), '.js'); - public function testGetMimeType() - { - $this->file('foo.txt', 'Hello World!'); - $this->assertSame('text/plain', MediaFile::make('foo.txt')->getMimeType()); + $this->assertStringStartsWith('?v=', $cacheBustKey); + $this->assertSame('?v=cd5de5e7', $cacheBustKey); // Expect CRC32 hash } - public function testGetMimeTypeWithoutExtension() + public function testGetOutputPath() { - $this->file('foo', 'Hello World!'); - $this->assertSame('text/plain', MediaFile::make('foo')->getMimeType()); - } + $this->file('_media/test.txt', 'Hello, World!'); + $mediaFile = MediaFile::make('test.txt'); - public function testGetMimeTypeWithEmptyFile() - { - $this->file('foo', ''); - $this->assertSame('application/x-empty', MediaFile::make('foo')->getMimeType()); + $expectedPath = Hyde::path('_site/media/test.txt'); + $this->assertSame($expectedPath, $mediaFile->getOutputPath()); } - public function testGetMimeTypeWithDirectory() + public function testGetOutputPathWithNestedFile() { - $this->directory('foo'); - $this->assertSame('directory', MediaFile::make('foo')->getMimeType()); - } + $this->file('_media/subfolder/nested_file.txt', 'Nested content'); + $mediaFile = MediaFile::make('subfolder/nested_file.txt'); - public function testGetMimeTypeWithNonExistentFile() - { - $this->assertSame('text/plain', MediaFile::make('foo')->getMimeType()); + $expectedPath = Hyde::path('_site/media/subfolder/nested_file.txt'); + $this->assertSame($expectedPath, $mediaFile->getOutputPath()); } - public function testAllHelperReturnsAllMediaFiles() + public function testGetOutputPathWithCustomMediaDirectory() { - $this->assertEquals([ - 'app.css' => new MediaFile('_media/app.css'), - ], MediaFile::all()); - } + Hyde::setMediaDirectory('custom_media'); + $this->file('custom_media/custom_file.txt', 'Custom content'); + $mediaFile = MediaFile::make('custom_file.txt'); - public function testAllHelperDoesNotIncludeNonMediaFiles() - { - $this->file('_media/foo.blade.php'); + $expectedPath = Hyde::path('_site/custom_media/custom_file.txt'); + $this->assertSame($expectedPath, $mediaFile->getOutputPath()); - $this->assertEquals([ - 'app.css' => new MediaFile('_media/app.css'), - ], MediaFile::all()); + Hyde::setMediaDirectory('_media'); // Reset to default } - public function testFilesHelperReturnsAllMediaFiles() + public function testGetOutputPathWithCustomOutputDirectory() { - $this->assertSame(['app.css'], MediaFile::files()); - } + Hyde::setOutputDirectory('custom_output'); + $this->file('_media/test.txt', 'Hello, World!'); + $mediaFile = MediaFile::make('test.txt'); - public function testGetIdentifierReturnsIdentifier() - { - $this->assertSame('foo', MediaFile::make('foo')->getIdentifier()); - } + $expectedPath = Hyde::path('custom_output/media/test.txt'); + $this->assertSame($expectedPath, $mediaFile->getOutputPath()); - public function testGetIdentifierWithSubdirectory() - { - $this->assertSame('foo/bar', MediaFile::make('foo/bar')->getIdentifier()); + Hyde::setOutputDirectory('_site'); // Reset to default } } diff --git a/packages/framework/tests/Feature/Views/MetadataViewTest.php b/packages/framework/tests/Feature/Views/MetadataViewTest.php index b4424aa18c0..1e517e8e0e1 100644 --- a/packages/framework/tests/Feature/Views/MetadataViewTest.php +++ b/packages/framework/tests/Feature/Views/MetadataViewTest.php @@ -26,7 +26,7 @@ protected function setUp(): void parent::setUp(); $this->withSiteUrl(); - config(['hyde.enable_cache_busting' => false]); + config(['hyde.cache_busting' => false]); } protected function build(?string $page = null): void @@ -92,7 +92,7 @@ public function testMetadataTagsInEmptyBladePage() $assertions = $this->assertSee('test', array_merge($this->getDefaultTags(), [ '
-
+
-
+
-
+
-
+
-
+
-
+