Skip to content

Commit

Permalink
Merge pull request #3 from alexjeffburke/master
Browse files Browse the repository at this point in the history
Bump to a customised version of resemble for node 8+.
  • Loading branch information
papandreou committed Mar 19, 2018
2 parents 701e784 + 96cb3f9 commit 9742f98
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -4,6 +4,7 @@ node_js:
- "0.12"
- "4"
- "6"
- "8"
env:
- CXX=g++-4.8
addons:
Expand Down
5 changes: 4 additions & 1 deletion lib/unexpectedResemble.js
Expand Up @@ -3,7 +3,7 @@ var _ = require('underscore'),
resemble;

try {
resemble = require('resemble');
resemble = require('@alexjeffburke/resemble');
} catch (e) {
isBrowserResembleJs = true;
resemble = require('resemblejs');
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -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"
},
Expand Down

0 comments on commit 9742f98

Please sign in to comment.