Merge pull request #354 from jiru/fix-svg-content-type

Fix Content-Type of SVG when handled by middleware
markstory · Aug 16, 2020 · a4c86b7 · a4c86b7
2 parents f04e1d9 + 8313658
commit a4c86b7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/Middleware/AssetCompressMiddleware.php b/src/Middleware/AssetCompressMiddleware.php
@@ -115,6 +115,7 @@ protected function mapType($build)
         $types = [
             'css' => 'text/css',
             'js' => 'application/javascript',
+            'svg' => 'image/svg+xml',
         ];
 
         return $types[$ext] ?? 'application/octet-stream';

diff --git a/tests/TestCase/Middleware/AssetCompressMiddlewareTest.php b/tests/TestCase/Middleware/AssetCompressMiddlewareTest.php
@@ -64,13 +64,37 @@ public function testBuildFile()
         $request = $this->request->withUri($uri);
 
         $result = $this->middleware->process($request, $this->handler);
-        $this->assertEquals('application/javascript', $result->getHeaderLine('Content-Type'));
 
         $body = $result->getBody()->getContents();
         $this->assertStringContainsString('var BaseClass = new Class', $body);
         $this->assertStringContainsString('var Template = new Class', $body);
     }
 
+    public function contentTypesProvider()
+    {
+        return [
+            ['/cache_js/libs.js', 'application/javascript'],
+            ['/cache_css/all.css', 'text/css'],
+            ['/cache_svg/foo.bar.svg', 'image/svg+xml'],
+        ];
+    }
+
+    /**
+     * test returned content types
+     *
+     * @dataProvider contentTypesProvider
+     * @return void
+     */
+    public function testBuildFileContentTypes($path, $expected)
+    {
+        $uri = $this->request->getUri()->withPath($path);
+        $request = $this->request->withUri($uri);
+
+        $result = $this->middleware->process($request, $this->handler);
+
+        $this->assertEquals($expected, $result->getHeaderLine('Content-Type'));
+    }
+
     /**
      * test building plugin assets.
      *
@@ -85,8 +109,6 @@ public function testPluginIniBuildFile()
 
         $result = $this->middleware->process($request, $this->handler);
 
-        $this->assertEquals('application/javascript', $result->getHeaderLine('Content-Type'));
-
         $body = $result->getBody()->getContents();
         $this->assertStringContainsString('var BaseClass = new Class', $body);
         $this->assertStringContainsString('var Template = new Class', $body);
@@ -105,7 +127,6 @@ public function testBuildFileIsCached()
         $result = $this->middleware->process($request, $this->handler);
 
         $body = $result->getBody()->getContents();
-        $this->assertEquals('application/javascript', $result->getHeaderLine('Content-Type'));
         $this->assertStringContainsString('BaseClass', $body);
 
         $this->assertTrue(file_exists(CACHE . 'asset_compress' . DS . 'libs.js'), 'Cache file was created.');
@@ -142,7 +163,6 @@ public function testBuildThemedAsset()
         $result = $this->middleware->process($request, $this->handler);
 
         $body = $result->getBody()->getContents();
-        $this->assertEquals('text/css', $result->getHeaderLine('Content-Type'));
         $this->assertStringContainsString('color: blue', $body);
     }