From d6ce4705b71f261fb143df839f686a92b5511390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Lehni?= <juerg@scratchdisk.com>
Date: Thu, 17 Mar 2016 11:35:06 +0100
Subject: [PATCH] Travis CI: Use Arial in all SVG tests and reduce tolerance.

---
 test/assets/clipping.svg |  8 ++++----
 test/helpers.js          |  2 +-
 test/tests/SvgImport.js  | 16 ++++------------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/test/assets/clipping.svg b/test/assets/clipping.svg
index 79381bfc..df167aaf 100644
--- a/test/assets/clipping.svg
+++ b/test/assets/clipping.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
 width="275" height="1041" viewBox="81 55 275 1041" xml:space="preserve">
-    <text transform="matrix(1 0 0 1 83.5002 68.5)" font-family="Helvetica" font-size="12">Clipping a path with a path:</text>
+    <text transform="matrix(1 0 0 1 83.5002 68.5)" font-family="Arial" font-size="12">Clipping a path with a path:</text>
     <g>
         <g>
             <path fill="none" stroke="#CECECE" stroke-miterlimit="10" d="M353,198c0,56.885-46.114,103-103,103c-56.885,0-103-46.115-103-103 S193.115,95,250,95C306.886,95,353,141.115,353,198z"
@@ -19,7 +19,7 @@ width="275" height="1041" viewBox="81 55 275 1041" xml:space="preserve">
             stroke-miterlimit="10" cx="250" cy="198" r="103" />
         </g>
     </g>
-    <text transform="matrix(1 0 0 1 83.5002 355.5)" font-family="Helvetica" font-size="12">Clipping a compound path with a path:</text>
+    <text transform="matrix(1 0 0 1 83.5002 355.5)" font-family="Arial" font-size="12">Clipping a compound path with a path:</text>
     <g>
         <g>
             <path fill="none" stroke="#CECECE" stroke-miterlimit="10" d="M353,491.911c0,56.885-46.114,103-103,103 c-56.885,0-103-46.115-103-103s46.115-103,103-103C306.886,388.911,353,435.026,353,491.911z M250,409.512 c-45.508,0-82.4,36.892-82.4,82.399s36.893,82.4,82.4,82.4c45.509,0,82.399-36.894,82.399-82.4 C332.4,446.403,295.509,409.512,250,409.512z"
@@ -39,7 +39,7 @@ width="275" height="1041" viewBox="81 55 275 1041" xml:space="preserve">
             />
         </g>
     </g>
-    <text transform="matrix(1 0 0 1 83.5002 650.5)" font-family="Helvetica" font-size="12">Clipping a path with a compound path:</text>
+    <text transform="matrix(1 0 0 1 83.5002 650.5)" font-family="Arial" font-size="12">Clipping a path with a compound path:</text>
     <g>
         <g>
             <path fill="none" stroke="#CECECE" stroke-miterlimit="10" d="M353,785.823c0,56.885-46.114,103-103,103 c-56.885,0-103-46.115-103-103c0-56.886,46.115-103,103-103C306.886,682.823,353,728.938,353,785.823z M250,703.423 c-45.508,0-82.4,36.892-82.4,82.4c0,45.508,36.893,82.399,82.4,82.399c45.509,0,82.399-36.893,82.399-82.399 C332.4,740.314,295.509,703.423,250,703.423z"
@@ -59,7 +59,7 @@ width="275" height="1041" viewBox="81 55 275 1041" xml:space="preserve">
             stroke-width="10" stroke-miterlimit="10" width="113" height="113" />
         </g>
     </g>
-    <text transform="matrix(1 0 0 1 83.5002 941.5)" font-family="Helvetica" font-size="12">Clipping a group with a path:</text>
+    <text transform="matrix(1 0 0 1 83.5002 941.5)" font-family="Arial" font-size="12">Clipping a group with a path:</text>
     <g>
         <defs>
             <rect id="SVGID_7_" x="153" y="970" width="113" height="113" />
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 df86f021..d5626f88 100644
--- a/test/tests/SvgImport.js
+++ b/test/tests/SvgImport.js
@@ -157,20 +157,12 @@ function importSVG(assert, url, message, options) {
 
 if (!isNode) {
     // JSDom does not have SVG rendering, so we can't test there.
-    var svgFiles = {
-        'butterfly': {},
-        'viewbox': {},
-        'clipping': {},
-        'arcs': { tolerance: 1e-3 },
-        'symbol': {},
-        'symbols': {},
-        'blendModes': {},
-        'gradients-1': {}
-    };
+    var svgFiles = ['butterfly', 'viewbox', 'clipping', 'arcs', 'symbol',
+            'symbols', 'blendModes', 'gradients-1'];
     // TODO: Investigate why Phantom struggles with this file:
     if (!isPhantom)
-        svgFiles['gradients-2'] = {};
-    Base.each(svgFiles, function(options, name) {
+        svgFiles.push('gradients-2');
+    svgFiles.forEach(function(name) {
         name += '.svg';
         test('Import ' + name, function(assert) {
             importSVG(assert, 'assets/' + name, null, options);