Error out properly if an image not supported by canvas is added to a …

…sprite.
assetgraph · Nov 26, 2015 · 4135f30 · 4135f30
1 parent 3b5d743
commit 4135f30
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 1 deletion.
diff --git a/lib/spriteBackgroundImages.js b/lib/spriteBackgroundImages.js
@@ -227,7 +227,15 @@ module.exports = function () {
 
                 seq(imageInfos)
                     .parMap(function (imageInfo) {
-                        getCanvasImageFromImageAsset(imageInfo.asset, this);
+                        getCanvasImageFromImageAsset(imageInfo.asset, function (err, canvasImage) {
+                            // For some reason parMap swallows errors!
+                            // Rewrite to use promises or async and get rid of this:
+                            if (err) {
+                                callback(err);
+                            } else {
+                                this(null, canvasImage);
+                            }
+                        }.bind(this));
                     })
                     .seqEach(function (canvasImage, i) {
                         extend(imageInfos[i], {

diff --git a/test/spriteBackgroundImages.js b/test/spriteBackgroundImages.js
@@ -305,4 +305,19 @@ describe('spriteBackgroundImages', function () {
                 expect(assetGraph, 'to contain relations', 'CssImage', 1);
             });
     });
+
+    it('should error out if an SVG image is added to a sprite', function () {
+        return expect(new AssetGraph({root: __dirname + '/../testdata/spriteBackgroundImages/svgInSprite/'})
+            .loadAssets('index.html')
+            .populate()
+            .queue(function (assetGraph) {
+                expect(assetGraph, 'to contain asset', 'Svg');
+            })
+            .queue(spriteBackgroundImages())
+            .queue(function (assetGraph) {
+                expect(assetGraph, 'to contain asset', 'Png', 1);
+                expect(assetGraph, 'to contain relations', 'CssImage', 1);
+            }),
+            'to be rejected with', /error while reading from input stream/);
+    });
 });
diff --git a/testdata/spriteBackgroundImages/svgInSprite/flag.svg b/testdata/spriteBackgroundImages/svgInSprite/flag.svg
diff --git a/testdata/spriteBackgroundImages/svgInSprite/index.html b/testdata/spriteBackgroundImages/svgInSprite/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <style type="text/css">
+            .blah {
+                background-image: url(flag.svg?sprite);
+            }
+        </style>
+    </head>
+
+    <body>
+        <div class="blah"></div>
+    </body>
+</html>