Skip to content

Commit 349fe8c

Browse files
s_ashiotiss_ashiotis
s_ashiotis
authored and
s_ashiotis
committed
fix error message for image dimensions to be exact on which image is which
1 parent 1d5a237 commit 349fe8c

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

Diff for: index.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,21 @@ class ResembleHelper extends Helper {
3737
* @returns {Promise<resolve | reject>}
3838
*/
3939
async _compareImages(image, diffImage, options) {
40-
const image1 = this.baseFolder + image;
41-
const image2 = this.screenshotFolder + image;
40+
const baseImage = this.baseFolder + image;
41+
const actualImage = this.screenshotFolder + image;
4242

4343
// check whether the base and the screenshot images are present.
44-
fs.access(image1, fs.constants.F_OK | fs.constants.W_OK, (err) => {
44+
fs.access(baseImage, fs.constants.F_OK | fs.constants.W_OK, (err) => {
4545
if (err) {
4646
throw new Error(
47-
`${image1} ${err.code === 'ENOENT' ? 'base image does not exist' : 'is read-only'}`);
47+
`${baseImage} ${err.code === 'ENOENT' ? 'base image does not exist' : 'is read-only'}`);
4848
}
4949
});
5050

51-
fs.access(image2, fs.constants.F_OK | fs.constants.W_OK, (err) => {
51+
fs.access(actualImage, fs.constants.F_OK | fs.constants.W_OK, (err) => {
5252
if (err) {
5353
throw new Error(
54-
`${image2} ${err.code === 'ENOENT' ? 'screenshot image does not exist' : 'is read-only'}`);
54+
`${actualImage} ${err.code === 'ENOENT' ? 'screenshot image does not exist' : 'is read-only'}`);
5555
}
5656
});
5757

@@ -65,14 +65,14 @@ class ResembleHelper extends Helper {
6565
this.debug("Tolerance Level Provided " + options.tolerance);
6666
const tolerance = options.tolerance;
6767

68-
resemble.compare(image1, image2, options, (err, data) => {
68+
resemble.compare(baseImage, actualImage, options, (err, data) => {
6969
if (err) {
7070
reject(err);
7171
} else {
7272
if (!data.isSameDimensions) {
73-
let dimensions1 = sizeOf(image1);
74-
let dimensions2 = sizeOf(image2);
75-
reject(new Error("The image1 is of " + dimensions1.height + " X " + dimensions1.width + " and image2 is of " + dimensions2.height + " X " + dimensions2.width + ". Please use images of same dimensions so as to avoid any unexpected results."));
73+
let dimensions1 = sizeOf(baseImage);
74+
let dimensions2 = sizeOf(actualImage);
75+
reject(new Error("The base image is of " + dimensions1.height + " X " + dimensions1.width + " and actual image is of " + dimensions2.height + " X " + dimensions2.width + ". Please use images of same dimensions so as to avoid any unexpected results."));
7676
}
7777
resolve(data);
7878
if (data.misMatchPercentage >= tolerance) {

0 commit comments

Comments
 (0)