From 96cb3f9d385d9abadb703ad446c4bc03ca700fe1 Mon Sep 17 00:00:00 2001 From: Alex J Burke Date: Mon, 19 Mar 2018 15:44:30 +0100 Subject: [PATCH] Bump to a customised version of resemble for node 8+. --- .travis.yml | 1 + lib/unexpectedResemble.js | 5 ++++- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52f2667..e415269 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ node_js: - "0.12" - "4" - "6" + - "8" env: - CXX=g++-4.8 addons: diff --git a/lib/unexpectedResemble.js b/lib/unexpectedResemble.js index 8587a2f..8b55ba1 100644 --- a/lib/unexpectedResemble.js +++ b/lib/unexpectedResemble.js @@ -3,7 +3,7 @@ var _ = require('underscore'), resemble; try { - resemble = require('resemble'); + resemble = require('@alexjeffburke/resemble'); } catch (e) { isBrowserResembleJs = true; resemble = require('resemblejs'); @@ -70,6 +70,9 @@ module.exports = { if (typeof data.mismatchPercentage === 'string') { data.mismatchPercentage = parseFloat(data.mismatchPercentage); } + // remove properties returned from newer the resemble/canvas versions + delete data.rawMisMatchPercentage; + delete data.diffBounds; var getImageDataUrl = data.getImageDataUrl; // These are noisy in the 'to satisfy' diff output diff --git a/package.json b/package.json index 1a45c41..a69dea5 100644 --- a/package.json +++ b/package.json @@ -4,11 +4,11 @@ "description": "Resemble.js plugin for the Unexpected assertion library", "main": "lib/unexpectedResemble.js", "dependencies": { + "@alexjeffburke/resemble": "1.5.0", "gettemporaryfilepath": "0.0.1", "image-type": "2.1.0", "magicpen-media": "^1.5.0", "minimist": "1.2.0", - "resemble": "1.4.0", "resemblejs": "2.2.1", "underscore": "1.8.3" },