Browse Source

Merge pull request #136 from HuddleEng/codecleanup

Added linting and Prettier
pull/140/head
James Cryer 7 years ago committed by GitHub
parent
commit
e71592d624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      .editorconfig
  2. 3
      .eslintignore
  3. 27
      .eslintrc
  4. 123
      chai-tests/main_spec.js
  5. 8
      compareImages.js
  6. 312
      demoassets/main.js
  7. 21
      memory-leak-test.js
  8. 30
      nodejs-tests/compareImages.test.js
  9. 111
      nodejs-tests/resemble.test.js
  10. 4529
      package-lock.json
  11. 28
      package.json
  12. 656
      resemble.js

14
.editorconfig

@ -0,0 +1,14 @@
root = true
[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
[*.md]
trim_trailing_whitespace = false
[{.travis.yml}]
indent_style = space
indent_size = 2

3
.eslintignore

@ -0,0 +1,3 @@
/node_modules
/libs
/demoassets

27
.eslintrc

@ -0,0 +1,27 @@
{
"extends": [
"eslint-config-es5",
"plugin:prettier/recommended"
],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
},
"rules": {
"prettier/prettier": [
"error",
{
"singleQuote": true,
"tabWidth": "4"
}
],
"no-console": "off",
"no-use-before-define": ["warn", { "functions": false, "classes": false, "variables": true }],
"func-names": ["warn", "as-needed"]
},
"env": {
"amd": true,
"es6": true
}
}

123
chai-tests/main_spec.js

File diff suppressed because one or more lines are too long

8
compareImages.js

@ -1,8 +1,8 @@
var resemble = require('./resemble'); const resemble = require("./resemble");
module.exports = function(image1, image2, options) { module.exports = function compareImages(image1, image2, options) {
return new Promise(function(resolve, reject) { return new Promise((resolve, reject) => {
resemble.compare(image1, image2, options, function(err, data) { resemble.compare(image1, image2, options, (err, data) => {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {

312
demoassets/main.js

@ -1,32 +1,32 @@
$(function(){ $(function() {
var $target = $('#drop-zone'); var $target = $("#drop-zone");
function dropZone($target, onDrop){ function dropZone($target, onDrop) {
$target. $target
bind('dragover', function(){ .bind("dragover", function() {
$target.addClass( 'drag-over' ); $target.addClass("drag-over");
return false; return false;
}). })
bind("dragend", function () { .bind("dragend", function() {
$target.removeClass( 'drag-over' ); $target.removeClass("drag-over");
return false; return false;
}). })
bind("dragleave", function () { .bind("dragleave", function() {
$target.removeClass( 'drag-over' ); $target.removeClass("drag-over");
return false; return false;
}). })
bind("drop", function(event) { .bind("drop", function(event) {
var file = event.originalEvent.dataTransfer.files[0]; var file = event.originalEvent.dataTransfer.files[0];
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
$target.removeClass( 'drag-over' ); $target.removeClass("drag-over");
var droppedImage = new Image(); var droppedImage = new Image();
var fileReader = new FileReader(); var fileReader = new FileReader();
fileReader.onload = function (event) { fileReader.onload = function(event) {
droppedImage.src = event.target.result; droppedImage.src = event.target.result;
$target.html(droppedImage); $target.html(droppedImage);
}; };
@ -37,29 +37,27 @@ $(function(){
}); });
} }
dropZone($target, function(file){ dropZone($target, function(file) {
resemble(file).onComplete(function(data) {
resemble(file).onComplete(function(data){ $("#image-data").show();
$('#image-data').show(); $("#red").css("width", data.red + "%");
$('#red').css('width',data.red+'%'); $("#green").css("width", data.green + "%");
$('#green').css('width',data.green+'%'); $("#blue").css("width", data.blue + "%");
$('#blue').css('width',data.blue+'%'); $("#alpha").css("width", data.alpha + "%");
$('#alpha').css('width',data.alpha+'%'); $("#brightness").css("width", data.brightness + "%");
$('#brightness').css('width',data.brightness+'%'); $("#white").css("width", data.white + "%");
$('#white').css('width',data.white+'%'); $("#black").css("width", data.black + "%");
$('#black').css('width',data.black+'%');
}); });
}); });
function onComplete(data){ function onComplete(data) {
var time = Date.now(); var time = Date.now();
var diffImage = new Image(); var diffImage = new Image();
diffImage.src = data.getImageDataUrl(); diffImage.src = data.getImageDataUrl();
$('#image-diff').html(diffImage); $("#image-diff").html(diffImage);
$(diffImage).click(function(){ $(diffImage).click(function() {
var w = window.open("about:blank", "_blank"); var w = window.open("about:blank", "_blank");
var html = w.document.documentElement; var html = w.document.documentElement;
var body = w.document.body; var body = w.document.body;
@ -74,25 +72,26 @@ $(function(){
img.alt = "image diff"; img.alt = "image diff";
img.style.maxWidth = "100%"; img.style.maxWidth = "100%";
img.addEventListener("click", function() { img.addEventListener("click", function() {
this.style.maxWidth = this.style.maxWidth === "100%" ? "" : "100%"; this.style.maxWidth =
this.style.maxWidth === "100%" ? "" : "100%";
}); });
body.appendChild(img); body.appendChild(img);
}); });
$('.buttons').show(); $(".buttons").show();
if(data.misMatchPercentage == 0){ if (data.misMatchPercentage == 0) {
$('#thesame').show(); $("#thesame").show();
$('#diff-results').hide(); $("#diff-results").hide();
} else { } else {
$('#mismatch').text(data.misMatchPercentage); $("#mismatch").text(data.misMatchPercentage);
if(!data.isSameDimensions){ if (!data.isSameDimensions) {
$('#differentdimensions').show(); $("#differentdimensions").show();
} else { } else {
$('#differentdimensions').hide(); $("#differentdimensions").hide();
} }
$('#diff-results').show(); $("#diff-results").show();
$('#thesame').hide(); $("#thesame").hide();
} }
} }
@ -100,142 +99,141 @@ $(function(){
var file2; var file2;
var resembleControl; var resembleControl;
dropZone($('#dropzone1'), function(file){ dropZone($("#dropzone1"), function(file) {
file1 = file; file1 = file;
if(file2){ if (file2) {
resembleControl = resemble(file).compareTo(file2).onComplete(onComplete); resembleControl = resemble(file)
.compareTo(file2)
.onComplete(onComplete);
} }
}); });
dropZone($('#dropzone2'), function(file){ dropZone($("#dropzone2"), function(file) {
file2 = file; file2 = file;
if(file1){ if (file1) {
resembleControl = resemble(file).compareTo(file1).onComplete(onComplete); resembleControl = resemble(file)
.compareTo(file1)
.onComplete(onComplete);
} }
}); });
var buttons = $('.buttons button'); var buttons = $(".buttons button");
buttons.click(function(){ buttons.click(function() {
var $this = $(this); var $this = $(this);
$this.parent('.buttons').find('button').removeClass('active'); $this
$this.addClass('active'); .parent(".buttons")
.find("button")
.removeClass("active");
$this.addClass("active");
if($this.is('#raw')){ if ($this.is("#raw")) {
resembleControl.ignoreNothing(); resembleControl.ignoreNothing();
} } else if ($this.is("#less")) {
else
if($this.is('#less')){
resembleControl.ignoreLess(); resembleControl.ignoreLess();
} }
if($this.is('#colors')){ if ($this.is("#colors")) {
resembleControl.ignoreColors(); resembleControl.ignoreColors();
} } else if ($this.is("#antialising")) {
else
if($this.is('#antialising')){
resembleControl.ignoreAntialiasing(); resembleControl.ignoreAntialiasing();
} } else if ($this.is("#alpha")) {
else
if($this.is('#alpha')){
resembleControl.ignoreAlpha(); resembleControl.ignoreAlpha();
} } else if ($this.is("#same-size")) {
else
if($this.is('#same-size')){
resembleControl.scaleToSameSize(); resembleControl.scaleToSameSize();
} } else if ($this.is("#original-size")) {
else
if($this.is('#original-size')){
resembleControl.useOriginalSize(); resembleControl.useOriginalSize();
} } else if ($this.is("#pink")) {
else resembleControl
if($this.is('#pink')){ .outputSettings({
resembleControl.outputSettings({
errorColor: { errorColor: {
red: 255, red: 255,
green: 0, green: 0,
blue: 255 blue: 255
} }
}).repaint(); })
} .repaint();
else } else if ($this.is("#yellow")) {
if($this.is('#yellow')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
errorColor: { errorColor: {
red: 255, red: 255,
green: 255, green: 255,
blue: 0 blue: 0
} }
}).repaint(); })
} .repaint();
else } else if ($this.is("#flat")) {
if($this.is('#flat')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
errorType: 'flat' errorType: "flat"
}).repaint(); })
} .repaint();
else } else if ($this.is("#movement")) {
if($this.is('#movement')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
errorType: 'movement' errorType: "movement"
}).repaint(); })
} .repaint();
else } else if ($this.is("#flatDifferenceIntensity")) {
if($this.is('#flatDifferenceIntensity')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
errorType: 'flatDifferenceIntensity' errorType: "flatDifferenceIntensity"
}).repaint(); })
} .repaint();
else } else if ($this.is("#movementDifferenceIntensity")) {
if($this.is('#movementDifferenceIntensity')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
errorType: 'movementDifferenceIntensity' errorType: "movementDifferenceIntensity"
}).repaint(); })
} .repaint();
else } else if ($this.is("#diffOnly")) {
if($this.is('#diffOnly')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
errorType: 'diffOnly' errorType: "diffOnly"
}).repaint(); })
} .repaint();
else } else if ($this.is("#opaque")) {
if($this.is('#opaque')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
transparency: 1 transparency: 1
}).repaint(); })
} .repaint();
else } else if ($this.is("#transparent")) {
if($this.is('#transparent')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
transparency: 0.3 transparency: 0.3
}).repaint(); })
} .repaint();
else } else if ($this.is("#boundingBox")) {
if($this.is('#boundingBox')){ resembleControl
resembleControl.outputSettings({ .outputSettings({
boundingBox: { boundingBox: {
left: $("#bounding-box-x1").val(), left: $("#bounding-box-x1").val(),
top: $("#bounding-box-y1").val(), top: $("#bounding-box-y1").val(),
right: $("#bounding-box-x2").val(), right: $("#bounding-box-x2").val(),
bottom: $("#bounding-box-y2").val() bottom: $("#bounding-box-y2").val()
} }
}).repaint(); })
$this.removeClass('active'); .repaint();
$this.removeClass("active");
} }
if($this.is('#ignoredBox')){ if ($this.is("#ignoredBox")) {
resembleControl.outputSettings({ resembleControl
.outputSettings({
ignoredBox: { ignoredBox: {
left: $("#ignored-box-x1").val(), left: $("#ignored-box-x1").val(),
top: $("#ignored-box-y1").val(), top: $("#ignored-box-y1").val(),
right: $("#ignored-box-x2").val(), right: $("#ignored-box-x2").val(),
bottom: $("#ignored-box-y2").val() bottom: $("#ignored-box-y2").val()
} }
}).repaint(); })
$this.removeClass('active'); .repaint();
$this.removeClass("active");
} }
}); });
(function(){ (function() {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
var xhr2 = new XMLHttpRequest(); var xhr2 = new XMLHttpRequest();
var xhr3 = new XMLHttpRequest(); var xhr3 = new XMLHttpRequest();
@ -243,59 +241,63 @@ $(function(){
var dtwo = $.Deferred(); var dtwo = $.Deferred();
var dthree = $.Deferred(); var dthree = $.Deferred();
xhr.open('GET', 'demoassets/People.jpg', true); xhr.open("GET", "demoassets/People.jpg", true);
xhr.responseType = 'blob'; xhr.responseType = "blob";
xhr.onload = function(e) { xhr.onload = function(e) {
done.resolve(this.response); done.resolve(this.response);
}; };
xhr.send(); xhr.send();
xhr2.open('GET', 'demoassets/People2.jpg', true); xhr2.open("GET", "demoassets/People2.jpg", true);
xhr2.responseType = 'blob'; xhr2.responseType = "blob";
xhr2.onload = function(e) { xhr2.onload = function(e) {
dtwo.resolve(this.response); dtwo.resolve(this.response);
}; };
xhr2.send(); xhr2.send();
xhr3.open('GET', 'demoassets/PeopleAlpha.png', true); xhr3.open("GET", "demoassets/PeopleAlpha.png", true);
xhr3.responseType = 'blob'; xhr3.responseType = "blob";
xhr3.onload = function(e) { xhr3.onload = function(e) {
dthree.resolve(this.response); dthree.resolve(this.response);
}; };
xhr3.send(); xhr3.send();
$('#example-images').click(function(){ $("#example-images").click(function() {
$("#dropzone1").html('<img src="demoassets/People.jpg"/>');
$('#dropzone1').html('<img src="demoassets/People.jpg"/>'); $("#dropzone2").html('<img src="demoassets/People2.jpg"/>');
$('#dropzone2').html('<img src="demoassets/People2.jpg"/>');
$.when(done, dtwo).done(function(file, file1){ $.when(done, dtwo).done(function(file, file1) {
if (typeof FileReader === 'undefined') { if (typeof FileReader === "undefined") {
resembleControl = resemble('demoassets/People.jpg').compareTo('demoassets/People2.jpg').onComplete(onComplete); resembleControl = resemble("demoassets/People.jpg")
.compareTo("demoassets/People2.jpg")
.onComplete(onComplete);
} else { } else {
resembleControl = resemble(file).compareTo(file1).onComplete(onComplete); resembleControl = resemble(file)
.compareTo(file1)
.onComplete(onComplete);
} }
}); });
return false; return false;
}); });
$('#example-images-alpha').click(function(){ $("#example-images-alpha").click(function() {
$("#dropzone1").html('<img src="demoassets/People.jpg"/>');
$('#dropzone1').html('<img src="demoassets/People.jpg"/>'); $("#dropzone2").html('<img src="demoassets/PeopleAlpha.png"/>');
$('#dropzone2').html('<img src="demoassets/PeopleAlpha.png"/>');
$.when(done, dthree).done(function(file, file1){ $.when(done, dthree).done(function(file, file1) {
if (typeof FileReader === 'undefined') { if (typeof FileReader === "undefined") {
resembleControl = resemble('demoassets/People.jpg').compareTo('demoassets/PeopleAlpha.png').onComplete(onComplete); resembleControl = resemble("demoassets/People.jpg")
.compareTo("demoassets/PeopleAlpha.png")
.onComplete(onComplete);
} else { } else {
resembleControl = resemble(file).compareTo(file1).onComplete(onComplete); resembleControl = resemble(file)
.compareTo(file1)
.onComplete(onComplete);
} }
}); });
return false; return false;
}); });
})();
}());
}); });

21
memory-leak-test.js

@ -1,18 +1,23 @@
/* eslint no-process-exit: "warn"*/
// node --expose-gc memory-leak-test.js // node --expose-gc memory-leak-test.js
const fs = require('fs'); const fs = require("fs");
const resemble = require('./resemble'); const resemble = require("./resemble");
let max = 2000; let max = 2000;
const timerLabel = "2000 compare"; const timerLabel = "2000 compare";
console.time(timerLabel); console.time(timerLabel);
compare(); compare();
function compare(){ function compare() {
const people = fs.readFileSync('./demoassets/ghost1.png'); const people = fs.readFileSync("./demoassets/ghost1.png");
const people2 = fs.readFileSync('./demoassets/ghost2.png'); const people2 = fs.readFileSync("./demoassets/ghost2.png");
resemble(people).compareTo(people2).onComplete(function() { resemble(people)
.compareTo(people2)
.onComplete(() => {
if (--max >= 0) { if (--max >= 0) {
process.nextTick(compare); process.nextTick(compare);
} else { } else {
@ -20,13 +25,13 @@ function compare(){
} }
global.gc(); global.gc();
if (max % 100 === 0) { if (max % 100 === 0) {
var mem = process.memoryUsage(); const mem = process.memoryUsage();
console.log(max, mem.rss, mem.heapUsed, mem.external); console.log(max, mem.rss, mem.heapUsed, mem.external);
} }
}); });
} }
function log(){ function log() {
console.timeEnd(timerLabel); console.timeEnd(timerLabel);
process.exit(0); process.exit(0);
} }

30
nodejs-tests/compareImages.test.js

@ -1,15 +1,17 @@
const compareImages = require('../compareImages'); /* eslint-env jest*/
const fs = require('fs');
describe('compareImages', () => { const compareImages = require("../compareImages");
test('works with buffers', async () => { const fs = require("fs");
describe("compareImages", () => {
test("works with buffers", async () => {
const data = await compareImages( const data = await compareImages(
fs.readFileSync('./demoassets/People.jpg'), fs.readFileSync("./demoassets/People.jpg"),
fs.readFileSync('./demoassets/People2.jpg') fs.readFileSync("./demoassets/People2.jpg")
); );
expect(data.isSameDimensions).toBe(true); expect(data.isSameDimensions).toBe(true);
expect(data.misMatchPercentage).toEqual('8.66'); expect(data.misMatchPercentage).toEqual("8.66");
const buffer = data.getBuffer(); const buffer = data.getBuffer();
@ -17,23 +19,25 @@ describe('compareImages', () => {
expect(buffer.length).toBe(91876); expect(buffer.length).toBe(91876);
const comparison = fs.readFileSync( const comparison = fs.readFileSync(
'./nodejs-tests/PeopleComparedToPeople2.png' "./nodejs-tests/PeopleComparedToPeople2.png"
); );
expect(buffer.equals(comparison)).toBe(true); expect(buffer.equals(comparison)).toBe(true);
const buffer2 = data.getBuffer(true); const buffer2 = data.getBuffer(true);
const comparison2 = fs.readFileSync( const comparison2 = fs.readFileSync(
'./nodejs-tests/PeopleComparedToPeople2WithOriginal.png' "./nodejs-tests/PeopleComparedToPeople2WithOriginal.png"
); );
expect(buffer2.equals(comparison2)).toBe(true); expect(buffer2.equals(comparison2)).toBe(true);
}); });
test('throws when failed', async () => { test("throws when failed", async () => {
const promise = compareImages( const promise = compareImages(
fs.readFileSync('./demoassets/People.jpg'), fs.readFileSync("./demoassets/People.jpg"),
'bogus data' "bogus data"
);
await expect(promise).rejects.toMatch(
"Error: error while reading from input stream"
); );
await expect(promise).rejects.toMatch('Error: error while reading from input stream');
}); });
}); });

111
nodejs-tests/resemble.test.js

@ -1,18 +1,24 @@
const resemble = require('../resemble'); /* eslint-env jest*/
const fs = require('fs');
const resemble = require("../resemble");
describe('resemble', () => { const fs = require("fs");
test('base64', () => {
const people_src = describe("resemble", () => {
'data:image/jpeg;base64,' + test("base64", () => {
fs.readFileSync('./demoassets/People.jpg', 'base64'); const peopleSrc = `data:image/jpeg;base64,${fs.readFileSync(
const people2_src = "./demoassets/People.jpg",
'data:image/jpeg;base64,' + "base64"
fs.readFileSync('./demoassets/People2.jpg', 'base64'); )}`;
const people2Src = `data:image/jpeg;base64,${fs.readFileSync(
return new Promise(function(resolve, reject) { "./demoassets/People2.jpg",
resemble(people_src).compareTo(people2_src).onComplete(function(data) { "base64"
// console.info('Reached oncomplete for base64_string'); )}`;
return new Promise(resolve => {
resemble(peopleSrc)
.compareTo(people2Src)
.onComplete(data => {
// console.info('Reached oncomplete for base64String');
expect(data.diffBounds.bottom).toEqual(431); expect(data.diffBounds.bottom).toEqual(431);
expect(data.diffBounds.left).toEqual(22); expect(data.diffBounds.left).toEqual(22);
expect(data.diffBounds.right).toEqual(450); expect(data.diffBounds.right).toEqual(450);
@ -20,7 +26,7 @@ describe('resemble', () => {
expect(data.dimensionDifference.height).toEqual(0); expect(data.dimensionDifference.height).toEqual(0);
expect(data.dimensionDifference.width).toEqual(0); expect(data.dimensionDifference.width).toEqual(0);
expect(data.isSameDimensions).toBe(true); expect(data.isSameDimensions).toBe(true);
expect(data.misMatchPercentage).toEqual('8.66'); expect(data.misMatchPercentage).toEqual("8.66");
resolve(); resolve();
}); });
}); });
@ -29,7 +35,7 @@ describe('resemble', () => {
// this doesn't work on windows // this doesn't work on windows
// test('files', () => { // test('files', () => {
// return new Promise(function(resolve, reject) { // return new Promise(function(resolve) {
// console.log('hello there how are you'); // console.log('hello there how are you');
// resemble('demoassets/People.jpg') // resemble('demoassets/People.jpg')
// .compareTo('demoassets/People2.jpg') // .compareTo('demoassets/People2.jpg')
@ -57,26 +63,29 @@ describe('resemble', () => {
// }); // });
// }); // });
test('file not found', () => { test("file not found", () =>
return new Promise(function(resolve, reject) { new Promise(resolve => {
resemble('../demoassets/People.jpg') resemble("../demoassets/People.jpg")
.compareTo('../demoassets/404-image.jpg') .compareTo("../demoassets/404-image.jpg")
.onComplete(function(data) { .onComplete(data => {
// console.info('Reached oncomplete for request_404'); // console.info('Reached oncomplete for request404');
// console.log(data); // console.log(data);
expect(data.error).toEqual('Error: error while reading from input stream'); expect(data.error).toEqual(
"Error: error while reading from input stream"
);
resolve(); resolve();
}); });
}); }));
});
test('node buffers jpg', () => { test("node buffers jpg", () => {
const people = fs.readFileSync('./demoassets/People.jpg'); const people = fs.readFileSync("./demoassets/People.jpg");
const people2 = fs.readFileSync('./demoassets/People2.jpg'); const people2 = fs.readFileSync("./demoassets/People2.jpg");
return new Promise(function(resolve, reject) { return new Promise(resolve => {
resemble(people).compareTo(people2).onComplete(function(data) { resemble(people)
// console.info('Reached oncomplete for base64_string'); .compareTo(people2)
.onComplete(data => {
// console.info('Reached oncomplete for base64String');
expect(data.diffBounds.bottom).toEqual(431); expect(data.diffBounds.bottom).toEqual(431);
expect(data.diffBounds.left).toEqual(22); expect(data.diffBounds.left).toEqual(22);
expect(data.diffBounds.right).toEqual(450); expect(data.diffBounds.right).toEqual(450);
@ -84,20 +93,21 @@ describe('resemble', () => {
expect(data.dimensionDifference.height).toEqual(0); expect(data.dimensionDifference.height).toEqual(0);
expect(data.dimensionDifference.width).toEqual(0); expect(data.dimensionDifference.width).toEqual(0);
expect(data.isSameDimensions).toBe(true); expect(data.isSameDimensions).toBe(true);
expect(data.misMatchPercentage).toEqual('8.66'); expect(data.misMatchPercentage).toEqual("8.66");
resolve(); resolve();
}); });
}); });
}); });
test("node buffers png", () => {
const people = fs.readFileSync("./demoassets/ghost1.png");
const people2 = fs.readFileSync("./demoassets/ghost2.png");
test('node buffers png', () => { return new Promise(resolve => {
const people = fs.readFileSync('./demoassets/ghost1.png'); resemble(people)
const people2 = fs.readFileSync('./demoassets/ghost2.png'); .compareTo(people2)
.onComplete(data => {
return new Promise(function(resolve, reject) { // console.info('Reached oncomplete for base64String');
resemble(people).compareTo(people2).onComplete(function(data) {
// console.info('Reached oncomplete for base64_string');
expect(data.diffBounds.bottom).toEqual(138); expect(data.diffBounds.bottom).toEqual(138);
expect(data.diffBounds.left).toEqual(90); expect(data.diffBounds.left).toEqual(90);
expect(data.diffBounds.right).toEqual(157); expect(data.diffBounds.right).toEqual(157);
@ -105,19 +115,17 @@ describe('resemble', () => {
expect(data.dimensionDifference.height).toEqual(0); expect(data.dimensionDifference.height).toEqual(0);
expect(data.dimensionDifference.width).toEqual(0); expect(data.dimensionDifference.width).toEqual(0);
expect(data.isSameDimensions).toBe(true); expect(data.isSameDimensions).toBe(true);
expect(data.misMatchPercentage).toEqual('0.27'); expect(data.misMatchPercentage).toEqual("0.27");
resolve(); resolve();
}); });
}); });
}); });
test("test partial diff with bounding box", () => {
const people = fs.readFileSync("./demoassets/ghost1.png");
const people2 = fs.readFileSync("./demoassets/ghost2.png");
test('test partial diff with bounding box', () => { return new Promise(resolve => {
const people = fs.readFileSync('./demoassets/ghost1.png');
const people2 = fs.readFileSync('./demoassets/ghost2.png');
return new Promise(function(resolve, reject) {
resemble.outputSettings({ resemble.outputSettings({
boundingBox: { boundingBox: {
left: 80, left: 80,
@ -127,13 +135,12 @@ describe('resemble', () => {
} }
}); });
resemble(people).compareTo(people2).onComplete(function(data) { resemble(people)
expect(data.misMatchPercentage).toEqual('0.04'); .compareTo(people2)
.onComplete(data => {
expect(data.misMatchPercentage).toEqual("0.04");
resolve(); resolve();
}); });
}); });
}); });
}); });

4529
package-lock.json generated

File diff suppressed because it is too large Load Diff

28
package.json

@ -1,20 +1,13 @@
{ {
"name": "resemblejs", "name": "resemblejs",
"version": "2.10.0", "version": "2.10.1",
"description": "Image analysis and comparison with HTML5", "description": "Image analysis and comparison with HTML5",
"main": "resemble.js", "main": "resemble.js",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/Huddle/Resemble.js.git" "url": "https://github.com/Huddle/Resemble.js.git"
}, },
"keywords": [ "keywords": ["comparison", "visual", "image", "diff", "compare", "html5"],
"comparison",
"visual",
"image",
"diff",
"compare",
"html5"
],
"author": "James Cryer", "author": "James Cryer",
"license": "MIT", "license": "MIT",
"bugs": { "bugs": {
@ -23,16 +16,29 @@
"homepage": "https://github.com/Huddle/Resemble.js", "homepage": "https://github.com/Huddle/Resemble.js",
"scripts": { "scripts": {
"test": "jest nodejs-tests", "test": "jest nodejs-tests",
"test-watch": "jest --watch nodejs-tests" "test-watch": "jest --watch nodejs-tests",
"precommit": "lint-staged",
"lint": "eslint **/*.js --fix"
},
"lint-staged": {
"*.{js,json,css,md}": ["prettier --write", "git add"]
}, },
"dependencies": { "dependencies": {
"canvas-prebuilt": "^1.6.5-prerelease.1" "canvas-prebuilt": "^1.6.5-prerelease.1"
}, },
"devDependencies": { "devDependencies": {
"chai": "^3.4.1", "chai": "^3.4.1",
"color-convert": "^1.9.0",
"eslint": "^4.19.1",
"eslint-config-es5": "^0.5.0",
"eslint-config-prettier": "^2.9.0",
"eslint-plugin-import": "^2.9.0",
"eslint-plugin-prettier": "^2.6.0",
"husky": "^0.14.3",
"jest": "^20.0.4", "jest": "^20.0.4",
"jest-cli": "^20.0.4", "jest-cli": "^20.0.4",
"color-convert": "^1.9.0" "lint-staged": "^7.0.0",
"prettier": "^1.11.1"
}, },
"jest": { "jest": {
"testEnvironment": "node" "testEnvironment": "node"

656
resemble.js

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save