Functional test for pipeline dev server

weaverryan · weaverryan · commit 88c7ef623182 · 2023-04-23T13:53:14.000-04:00
diff --git a/src/Symfony/Component/Asset/Pipeline/AssetPipelineDevServerSubscriber.php b/src/Symfony/Component/Asset/Pipeline/AssetPipelineDevServerSubscriber.php
@@ -42,7 +42,7 @@ public function onKernelRequest(RequestEvent $event): void
             throw new NotFoundHttpException(sprintf('Asset "%s" not found.', $assetPath));
         }
 
-        if ($this->assetPipeline->getDigest($asset->getLogicalPath()) === $digest) {
+        if ($this->assetPipeline->getDigest($asset->getLogicalPath()) !== $digest) {
             throw new NotFoundHttpException(sprintf('Asset "%s" was found but the digest does not match.', $assetPath));
         }
 
@@ -75,6 +75,10 @@ private function extractAssetPathAndDigest(string $fullPath): array
         $fullPath = substr($fullPath, \strlen($this->assetPipeline->getPublicPrefix()));
         preg_match('/-([0-9a-zA-Z]{7,128}(?:\.digested)?)\.[^.]+\z/', $fullPath, $matches);
         $digest = $matches[1] ?? null;
+        // check for pre-digested assets
+        if (str_ends_with($digest, '.digested')) {
+            $digest = null;
+        }
         $path = $digest ? str_replace("-{$digest}", '', $fullPath) : $fullPath;
 
         return [$path, $digest];
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/AssetPipelineCompilerTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/AssetPipelineCompilerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Pipeline;
+namespace Symfony\Component\Asset\Tests\Pipeline;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Asset\Pipeline\AssetCompilerInterface;
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/AssetPipelineDevServerSubscriberFunctionalTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/AssetPipelineDevServerSubscriberFunctionalTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Pipeline;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+use Symfony\Component\Asset\Tests\fixtures\pipeline\PipelineTestAppKernel;
+
+class AssetPipelineDevServerSubscriberFunctionalTest extends WebTestCase
+{
+    public function testGettingAssetWorks(): void
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/assets/file1-b3445cb7a86a0795a7af7f2004498aef.css');
+        $response = $client->getResponse();
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(<<<EOF
+        /* file1.css */
+        body {}
+
+        EOF, $response->getContent());
+        $this->assertSame('"b3445cb7a86a0795a7af7f2004498aef"', $response->headers->get('ETag'));
+        $this->assertSame('immutable, public, s-maxage=604800', $response->headers->get('Cache-Control'));
+    }
+
+    public function test404OnUnknownAsset(): void
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/assets/unknown.css');
+        $response = $client->getResponse();
+        $this->assertSame(404, $response->getStatusCode());
+    }
+
+    public function test404OnInvalidDigest(): void
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/assets/file1-fakedigest.css');
+        $response = $client->getResponse();
+        $this->assertSame(404, $response->getStatusCode());
+        $this->assertStringContainsString('Asset &quot;file1.css&quot; was found but the digest does not match.', $response->getContent());
+    }
+
+    public function testPreDigestedAssetIsReturned(): void
+    {
+        $client = static::createClient();
+
+        $client->request('GET', '/assets/already-abcdefVWXYZ0123456789.digested.css');
+        $response = $client->getResponse();
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(<<<EOF
+        /* already-abcdefVWXYZ0123456789.digested.css */
+        body {}
+
+        EOF, $response->getContent());
+    }
+
+    protected static function getKernelClass(): string
+    {
+        return PipelineTestAppKernel::class;
+    }
+}
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/AssetPipelineRepositoryTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/AssetPipelineRepositoryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Pipeline;
+namespace Symfony\Component\Asset\Tests\Pipeline;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Asset\Pipeline\AssetPipelineRepository;
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/AssetPipelineTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/AssetPipelineTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Pipeline;
+namespace Symfony\Component\Asset\Tests\Pipeline;
 
 use Symfony\Bundle\TwigBundle\Tests\TestCase;
 use Symfony\Component\Asset\Pipeline\AssetCompilerInterface;
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/Compiler/AssetCompilerPathResolverTraitTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/Compiler/AssetCompilerPathResolverTraitTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Pipeline\Compiler;
+namespace Symfony\Component\Asset\Tests\Pipeline\Compiler;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Asset\Exception\RuntimeException;
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/Compiler/JavaScriptImportPathCompilerTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/Compiler/JavaScriptImportPathCompilerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Pipeline\Compiler;
+namespace Symfony\Component\Asset\Tests\Pipeline\Compiler;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Asset\Exception\RuntimeException;
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/Compiler/SourceMappingUrlsCompilerTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/Compiler/SourceMappingUrlsCompilerTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Pipeline\Compiler;
+namespace Symfony\Component\Asset\Tests\Pipeline\Compiler;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Asset\Pipeline\AssetPipeline;
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/PipelineAwareAssetPackageIntegrationTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/PipelineAwareAssetPackageIntegrationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Pipeline;
+namespace Symfony\Component\Asset\Tests\Pipeline;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Asset\Packages;
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/PipelineAwareAssetPackageTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/PipelineAwareAssetPackageTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Pipeline;
+namespace Symfony\Component\Asset\Tests\Pipeline;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Asset\PackageInterface;
diff --git a/src/Symfony/Component/Asset/Tests/Pipeline/PipelinedAssetTest.php b/src/Symfony/Component/Asset/Tests/Pipeline/PipelinedAssetTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Pipeline;
+namespace Symfony\Component\Asset\Tests\Pipeline;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Asset\Pipeline\PipelinedAsset;
diff --git a/src/Symfony/Component/Asset/Tests/fixtures/pipeline/PipelineTestAppKernel.php b/src/Symfony/Component/Asset/Tests/fixtures/pipeline/PipelineTestAppKernel.php
@@ -31,7 +31,8 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
                     'pipeline' => [
                         'paths' => ['dir1', 'dir2'],
                     ]
-                ]
+                ],
+                'test' => true,
             ]);
 
             $container->setAlias('public.assets.packages', new Alias('assets.packages', true));
