From 2253e84c4780d6ea39c2a5e924baae009a8d369b Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Wed, 27 Apr 2016 19:46:15 -0400 Subject: [PATCH] Numerical improvements to matcher --- test/mockContext.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/test/mockContext.js b/test/mockContext.js index 08d6101aa..14cd1eec9 100644 --- a/test/mockContext.js +++ b/test/mockContext.js @@ -126,9 +126,15 @@ function toBeCloseToPixel() { return { compare: function(actual, expected) { - var result = (!isNaN(actual) && !isNaN(expected))? - Math.abs(actual - expected) < 2 : // 2 pixels tolerance - false; + var result = false; + + if (!isNaN(actual) && !isNaN(expected)) { + var diff = Math.abs(actual - expected); + var A = Math.abs(actual); + var B = Math.abs(expected); + var percentDiff = 0.005; // 0.5% diff + result = (diff <= (A > B ? A : B) * percentDiff) || diff < 2; // 2 pixels is fine + } return { pass: result }; } @@ -137,7 +143,7 @@ window.addDefaultMatchers = function(jasmine) { jasmine.addMatchers({ - toBeCloseToPixel: toBeCloseToPixel + toBeCloseToPixel: toBeCloseToPixel, }); } -- 2.47.3