From 0cb7a4b8bc52a2fef186cae7ebdff477b1523473 Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Fri, 15 Dec 2017 10:48:03 -0500 Subject: [PATCH 1/2] Display the load error, if available --- nodejs-tests/compareImages.test.js | 2 +- nodejs-tests/resemble.test.js | 2 +- resemble.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nodejs-tests/compareImages.test.js b/nodejs-tests/compareImages.test.js index 9f64f89..263330d 100644 --- a/nodejs-tests/compareImages.test.js +++ b/nodejs-tests/compareImages.test.js @@ -34,6 +34,6 @@ describe('compareImages', () => { fs.readFileSync('./demoassets/People.jpg'), 'bogus data' ); - await expect(promise).rejects.toMatch('Image load error.'); + await expect(promise).rejects.toMatch('Error: error while reading from input stream'); }); }); diff --git a/nodejs-tests/resemble.test.js b/nodejs-tests/resemble.test.js index dd89049..6d47ded 100644 --- a/nodejs-tests/resemble.test.js +++ b/nodejs-tests/resemble.test.js @@ -64,7 +64,7 @@ describe('resemble', () => { .onComplete(function(data) { // console.info('Reached oncomplete for request_404'); // console.log(data); - expect(data.error).toEqual('Image load error.'); + expect(data.error).toEqual('Error: error while reading from input stream'); resolve(); }); }); diff --git a/resemble.js b/resemble.js index c7889f0..321a94e 100644 --- a/resemble.js +++ b/resemble.js @@ -190,9 +190,9 @@ URL: https://github.com/Huddle/Resemble.js hiddenImage.setAttribute('crossorigin', 'anonymous'); } - hiddenImage.onerror = function () { + hiddenImage.onerror = function (err) { hiddenImage.onerror = null; //fixes pollution between calls - images.push({ error : "Image load error."}); + images.push({ error : err ? err + "" : "Image load error" }); callback(); }; From 906ba229c4d137bc50fb3434f3677fed2ebee10d Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Fri, 15 Dec 2017 10:51:05 -0500 Subject: [PATCH 2/2] Add back "." --- resemble.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resemble.js b/resemble.js index 321a94e..9d3b854 100644 --- a/resemble.js +++ b/resemble.js @@ -192,7 +192,7 @@ URL: https://github.com/Huddle/Resemble.js hiddenImage.onerror = function (err) { hiddenImage.onerror = null; //fixes pollution between calls - images.push({ error : err ? err + "" : "Image load error" }); + images.push({ error : err ? err + "" : "Image load error." }); callback(); };