diff --git a/examples/SVG Import/Arcs.html b/examples/SVG Import/Arcs.html index 6a2412a9..356b0d7e 100644 --- a/examples/SVG Import/Arcs.html +++ b/examples/SVG Import/Arcs.html @@ -11,67 +11,67 @@ - - - - - - - - - - - - Arc start - Arc end - - - - - - - - - - large-arc-flag=0 - sweep-flag=0 - - - - - large-arc-flag=0 - sweep-flag=1 - - - - - large-arc-flag=1 - sweep-flag=0 - - - - - large-arc-flag=1 - sweep-flag=1 - - - + + + + + + + + + + + Arc start + Arc end + + + + + + + + + large-arc-flag=0 + sweep-flag=0 + + + + + large-arc-flag=0 + sweep-flag=1 + + + + + large-arc-flag=1 + sweep-flag=0 + + + + + large-arc-flag=1 + sweep-flag=1 + + + + + diff --git a/examples/SVG Import/Symbols.html b/examples/SVG Import/Symbols.html index 51934e4f..26f5884a 100644 --- a/examples/SVG Import/Symbols.html +++ b/examples/SVG Import/Symbols.html @@ -2,7 +2,7 @@ - Multiple Paths Test 2 + Symbols Test - + - - - - + + + + diff --git a/test/assets/blendModes.svg b/test/assets/blendModes.svg new file mode 100644 index 00000000..9a40442b --- /dev/null +++ b/test/assets/blendModes.svg @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/assets/symbol.svg b/test/assets/symbol.svg new file mode 100644 index 00000000..1c36cbb5 --- /dev/null +++ b/test/assets/symbol.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/test/assets/symbols.svg b/test/assets/symbols.svg new file mode 100644 index 00000000..e6ff9495 --- /dev/null +++ b/test/assets/symbols.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/test/helpers.js b/test/helpers.js index 0090bb25..f38c165e 100644 --- a/test/helpers.js +++ b/test/helpers.js @@ -490,7 +490,7 @@ var compareSVG = function(done, actual, expected, message, options) { function compare() { comparePixels(actual, expected, message, Base.set({ - tolerance: 1e-2, + tolerance: 1e-3, resolution: 72 }, options)); done(); diff --git a/test/tests/SvgImport.js b/test/tests/SvgImport.js index 670eadc5..4bc6abed 100644 --- a/test/tests/SvgImport.js +++ b/test/tests/SvgImport.js @@ -135,6 +135,8 @@ test('Import SVG without insertion', function() { function importSVG(assert, url, message, options) { var done = assert.async(); project.importSVG(url, { + applyMatrix: false, + onLoad: function(item, svg) { if (!message) { message = 'The imported SVG "' + url + '" should visually be ' @@ -142,6 +144,7 @@ function importSVG(assert, url, message, options) { } compareSVG(done, item, svg, message, options); }, + onError: function(error) { var ok = !!(options && options.expectError); QUnit.push(ok, false, !ok, ok && message @@ -154,7 +157,7 @@ function importSVG(assert, url, message, options) { if (!isNode) { // JSDom does not have SVG rendering, so we can't test there. - var svgFiles = ['viewbox', 'clipping', 'gradients-1']; + var svgFiles = ['viewbox', 'clipping', 'symbol', 'symbols', 'blendModes', 'gradients-1']; // TODO: Investigate why Phantom struggles with this file: if (!isPhantom) svgFiles.push('gradients-2');