Skip to content

Commit 5181f41

Browse files
authored
Merge pull request #43 from tairun/avoid-crash-on-size-mismatch
Avoid crash on size mismatch
2 parents b5afcb8 + d916421 commit 5181f41

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

Diff for: index.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@ class ResembleHelper extends Helper {
1616
/**
1717
* Compare Images
1818
*
19-
* @param image1
20-
* @param image2
19+
* @param image
2120
* @param diffImage
2221
* @param options
2322
* @returns {Promise<any | never>}
2423
*/
25-
async _compareImages(image1, image2, diffImage, options) {
26-
image1 = this.config.baseFolder + image1;
27-
image2 = this.config.screenshotFolder + image2;
24+
async _compareImages(image, diffImage, options) {
25+
const image1 = this.config.baseFolder + image;
26+
const image2 = this.config.screenshotFolder + image;
2827

2928
// check whether the base and the screenshot images are present.
3029
fs.access(image1, fs.constants.F_OK | fs.constants.W_OK, (err) => {
@@ -55,7 +54,7 @@ class ResembleHelper extends Helper {
5554
if (err) {
5655
reject(err);
5756
} else {
58-
if(!data.isSameDimensions) throw new Error("The images are not of same dimensions. Please use images of same dimensions so as to avoid any unexpected results.")
57+
if(!data.isSameDimensions) reject(new Error("The images are not of same dimensions. Please use images of same dimensions so as to avoid any unexpected results."));
5958
resolve(data);
6059
if (data.misMatchPercentage >= tolerance) {
6160
mkdirp(getDirName(this.config.diffFolder + diffImage), function (err) {
@@ -78,14 +77,13 @@ class ResembleHelper extends Helper {
7877

7978
/**
8079
*
81-
* @param image1
80+
* @param image
8281
* @param options
8382
* @returns {Promise<*>}
8483
*/
85-
async _fetchMisMatchPercentage(image1, options) {
86-
const image2 = image1;
87-
const diffImage = "Diff_" + image1.split(".")[0];
88-
const result = this._compareImages(image1, image2, diffImage, options);
84+
async _fetchMisMatchPercentage(image, options) {
85+
const diffImage = "Diff_" + image.split(".")[0];
86+
const result = this._compareImages(image, diffImage, options);
8987
const data = await Promise.resolve(result);
9088
return data.misMatchPercentage;
9189
}

0 commit comments

Comments
 (0)