Implemented custom Jasmine matcher for SVG paths that checks pixel ro…

…unded values - JavaScript rounding is a bit inconsistent for very small values...
n3-charts · Nov 11, 2013 · 1a4e5de · 1a4e5de
1 parent f727179
commit 1a4e5de
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 9 deletions.
diff --git a/dist/pie-chart.js b/dist/pie-chart.js
@@ -1,4 +1,4 @@
-/*! pie-chart - v1.0.0 - 2013-11-10
+/*! pie-chart - v1.0.0 - 2013-11-11
 * https://github.com/n3-charts/pie-chart
 * Copyright (c) 2013 n3-charts Licensed , */
 angular.module('n3-pie-chart', ['n3-pie-utils'])

diff --git a/dist/pie-chart.min.js b/dist/pie-chart.min.js
diff --git a/dist/pie-chart.spec.js b/dist/pie-chart.spec.js
@@ -1,4 +1,4 @@
-/*! pie-chart - v1.0.0 - 2013-11-10
+/*! pie-chart - v1.0.0 - 2013-11-11
 * https://github.com/n3-charts/pie-chart
 * Copyright (c) 2013 n3-charts Licensed , */
 'use strict';
@@ -42,8 +42,70 @@ describe('n3-piechart', function() {
  }
  }
 
+ return true;
+ },
+
+ toBeSamePathAs: function(expected) {
+ var actual = this.actual;
+ var notText = this.isNot ? " not" : "";
+
+ var errorMsg = "";
+
+ this.message = function () {
+ return "Expected " + actual + notText + " to be same path as " + expected + " (" + errorMsg + ")";
+ };
+
+ if (!actual) {
+ return false;
+ }
+
+ var getInstructions = function(path) {
+ var a = [];
+
+ var sp = path.split(/([A-Z])/g);
+
+ for (var i = 1; i < sp.length; i+=2) {
+ a.push({type: sp[i], values: sp[i+1].split(/[\s,]/)});
+ }
+
+ return a;
+ };
+
+ var expectedArray = getInstructions(expected);
+ var actualArray = getInstructions(actual);
+
+ if (expectedArray.length !== actualArray.length) {
+ return false;
+ }
+
+ for (var i = 0; i < expectedArray.length; i++) {
+ var a = expectedArray[i];
+ var b = actualArray[i];
+
+ if (a.type !== b.type) {
+ errorMsg = a.type + " !== " + b.type;
+ return false;
+ }
+
+ if (a.values.length !== b.values.length) {
+ errorMsg = "different values length";
+ return false;
+ }
+
+ for (var j = 0; j < a.values.length; j++) {
+ var vA = a.values[j];
+ var vB = b.values[j];
+
+ if (parseInt(vA, 10) !== parseInt(vB, 10) && vA !== "" && vB !== "") {
+ errorMsg = vA + " !== " + vB;
+ return false;
+ }
+ }
+ }
+
  return true;
  }
+
  });
  });
 
@@ -156,7 +218,7 @@ describe("gauge mode", function() {
 
  runs(function () {
  expected.forEach(function(d, i) {
- expect(arcs.childNodes[i].getAttribute("d").trim()).toBe(d);
+ expect(arcs.childNodes[i].getAttribute("d")).toBeSamePathAs(d);
  });
  });
  });
@@ -185,7 +247,7 @@ describe("gauge mode", function() {
  arcs = content.childNodes[0].childNodes;
  runs(function () {
  expected.forEach(function(d, i) {
- expect(arcs[i].getAttribute("d").trim()).toBe(d);
+ expect(arcs[i].getAttribute("d")).toBeSamePathAs(d);
  });
  });
  });
@@ -672,7 +734,7 @@ describe('standard mode', function() {
  runs(function () {
  expected.forEach(function(d, i) {
  expect(arcs.childNodes[i].nodeName).toBe("path");
- expect(arcs.childNodes[i].getAttribute("d").trim()).toBe(d);
+ expect(arcs.childNodes[i].getAttribute("d")).toBeSamePathAs(d);
  });
  });
  });

diff --git a/test/gauge_mode.spec.js b/test/gauge_mode.spec.js
@@ -107,7 +107,7 @@ describe("gauge mode", function() {
 
  runs(function () {
  expected.forEach(function(d, i) {
- expect(arcs.childNodes[i].getAttribute("d").trim()).toBe(d);
+ expect(arcs.childNodes[i].getAttribute("d")).toBeSamePathAs(d);
  });
  });
  });
@@ -136,7 +136,7 @@ describe("gauge mode", function() {
  arcs = content.childNodes[0].childNodes;
  runs(function () {
  expected.forEach(function(d, i) {
- expect(arcs[i].getAttribute("d").trim()).toBe(d);
+ expect(arcs[i].getAttribute("d")).toBeSamePathAs(d);
  });
  });
  });

diff --git a/test/spec.header b/test/spec.header
@@ -39,7 +39,69 @@ describe('n3-piechart', function() {
  }
  }
 
+ return true;
+ },
+
+ toBeSamePathAs: function(expected) {
+ var actual = this.actual;
+ var notText = this.isNot ? " not" : "";
+
+ var errorMsg = "";
+
+ this.message = function () {
+ return "Expected " + actual + notText + " to be same path as " + expected + " (" + errorMsg + ")";
+ };
+
+ if (!actual) {
+ return false;
+ }
+
+ var getInstructions = function(path) {
+ var a = [];
+
+ var sp = path.split(/([A-Z])/g);
+
+ for (var i = 1; i < sp.length; i+=2) {
+ a.push({type: sp[i], values: sp[i+1].split(/[\s,]/)});
+ }
+
+ return a;
+ };
+
+ var expectedArray = getInstructions(expected);
+ var actualArray = getInstructions(actual);
+
+ if (expectedArray.length !== actualArray.length) {
+ return false;
+ }
+
+ for (var i = 0; i < expectedArray.length; i++) {
+ var a = expectedArray[i];
+ var b = actualArray[i];
+
+ if (a.type !== b.type) {
+ errorMsg = a.type + " !== " + b.type;
+ return false;
+ }
+
+ if (a.values.length !== b.values.length) {
+ errorMsg = "different values length";
+ return false;
+ }
+
+ for (var j = 0; j < a.values.length; j++) {
+ var vA = a.values[j];
+ var vB = b.values[j];
+
+ if (parseInt(vA, 10) !== parseInt(vB, 10) && vA !== "" && vB !== "") {
+ errorMsg = vA + " !== " + vB;
+ return false;
+ }
+ }
+ }
+
  return true;
  }
+
  });
  });
diff --git a/test/standard_mode.spec.js b/test/standard_mode.spec.js
@@ -106,7 +106,7 @@ describe('standard mode', function() {
  runs(function () {
  expected.forEach(function(d, i) {
  expect(arcs.childNodes[i].nodeName).toBe("path");
- expect(arcs.childNodes[i].getAttribute("d").trim()).toBe(d);
+ expect(arcs.childNodes[i].getAttribute("d")).toBeSamePathAs(d);
  });
  });
  });