Tools: moved prettifying of candidate & reference svgs

rikapo · Nov 18, 2020 · c6c2574 · c6c2574
1 parent c741ea9
commit c6c2574
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/test/karma-imagecapture-reporter.js b/test/karma-imagecapture-reporter.js
@@ -27,25 +27,6 @@ function ImageCaptureReporter(baseReporterDecorator, config, logger, emitter) {
         referenceRun = false
     } = config;
 
-    /**
-     * Basic pretty-print SVG, each tag on a new line.
-     * @param  {String} svg The SVG
-     * @return {String}     Pretty SVG
-     */
-    function prettyXML(svg) {
-        svg = svg
-            .replace(/>/g, '>\n')
-
-            // Don't introduce newlines inside tspans or links, it will make the text
-            // render differently
-            .replace(/<tspan([^>]*)>\n/g, '<tspan$1>')
-            .replace(/<\/tspan>\n/g, '</tspan>')
-            .replace(/<a([^>]*)>\n/g, '<a$1>')
-            .replace(/<\/a>\n/g, '</a>');
-
-        return svg;
-    }
-
     /**
      * Create an animated gif of the reference and the candidata image, in order to
      * see the differences.
@@ -158,7 +139,7 @@ function ImageCaptureReporter(baseReporterDecorator, config, logger, emitter) {
         try {
             if (/\.svg$/.test(filename)) {
                 pendingFileWritings++;
-                fs.writeFile(filename, prettyXML(data), err => {
+                fs.writeFile(filename, data, err => {
                     if (err) {
                         throw err;
                     }

diff --git a/test/karma-setup.js b/test/karma-setup.js
@@ -414,6 +414,25 @@ Highcharts.prepareShot = function (chart) {
     }
 };
 
+/**
+* Basic pretty-print SVG, each tag on a new line.
+* @param  {String} svg The SVG
+* @return {String}     Pretty SVG
+*/
+function prettyXML(svg) {
+    svg = svg
+        .replace(/>/g, '>\n')
+
+        // Don't introduce newlines inside tspans or links, it will make the text
+        // render differently
+        .replace(/<tspan([^>]*)>\n/g, '<tspan$1>')
+        .replace(/<\/tspan>\n/g, '</tspan>')
+        .replace(/<a([^>]*)>\n/g, '<a$1>')
+        .replace(/<\/a>\n/g, '</a>');
+
+    return svg;
+}
+
 /**
  * Get the SVG of a chart, or the first SVG in the page
  * @param  {Object} chart The chart
@@ -445,7 +464,8 @@ function getSVG(chart) {
             svg = document.getElementsByTagName('svg')[0].outerHTML;
         }
     }
-    return svg;
+
+    return prettyXML(svg);
 }
 
 /**