Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: createMissingImages option #222

Merged
merged 4 commits into from
May 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ cy.matchImage({
diffConfig: {
threshold: 0.01,
},
// whether to create missing baseline images automatically
// default: true
createMissingImages: false,
// whether to update images automatically, without making a diff - useful for CI
// default: false
updateImages: true,
Expand Down
1 change: 1 addition & 0 deletions src/__snapshots__/task.hook.test.ts.snap

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions src/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ declare global {
type MatchImageOptions = {
screenshotConfig?: Partial<Cypress.ScreenshotDefaultsOptions>;
diffConfig?: Parameters<typeof pixelmatch>[5];
createMissingImages?: boolean;
updateImages?: boolean;
/**
* @deprecated since version 3.0, use imagesPath instead
Expand Down Expand Up @@ -87,6 +88,12 @@ export const getConfig = (options: Cypress.MatchImageOptions) => {
Cypress.env("pluginVisualRegressionForceDeviceScaleFactor") === false
? 1
: 1 / window.devicePixelRatio,
createMissingImages:
options.createMissingImages ||
(Cypress.env("pluginVisualRegressionCreateMissingImages") as
| boolean
| undefined) ||
true,
updateImages:
options.updateImages ||
(Cypress.env("pluginVisualRegressionUpdateImages") as
Expand Down Expand Up @@ -125,6 +132,7 @@ Cypress.Commands.add(

const {
scaleFactor,
createMissingImages,
updateImages,
imagesPath,
maxDiffThreshold,
Expand Down Expand Up @@ -178,6 +186,7 @@ Cypress.Commands.add(
imgNew: imgPath,
imgOld:
matchAgainstPath || imgPath.replace(FILE_SUFFIX.actual, ""),
createMissingImages,
updateImages,
maxDiffThreshold,
diffConfig,
Expand Down
28 changes: 28 additions & 0 deletions src/task.hook.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const newFileContent = "new file content";

const generateConfig = async (cfg: Partial<CompareImagesCfg>) => ({
updateImages: false,
createMissingImages: true,
scaleFactor: 1,
title: "some title",
imgNew: await writeTmpFixture((await file()).path, newImgFixture),
Expand All @@ -48,6 +49,7 @@ describe("getScreenshotPathInfoTask", () => {
titleFromOptions: "some-title-withśpęćiał人物",
imagesPath: "nested/images/dir",
specPath,
currentRetryNumber: 0,
})
).toEqual({
screenshotPath:
Expand All @@ -62,6 +64,7 @@ describe("getScreenshotPathInfoTask", () => {
titleFromOptions: "some-title",
imagesPath: "{spec_path}/images/dir",
specPath,
currentRetryNumber: 0,
})
).toEqual({
screenshotPath:
Expand All @@ -76,6 +79,7 @@ describe("getScreenshotPathInfoTask", () => {
titleFromOptions: "some-title",
imagesPath: "/images/dir",
specPath,
currentRetryNumber: 0,
})
).toEqual({
screenshotPath:
Expand All @@ -88,6 +92,7 @@ describe("getScreenshotPathInfoTask", () => {
titleFromOptions: "some-title",
imagesPath: "C:/images/dir",
specPath,
currentRetryNumber: 0,
})
).toEqual({
screenshotPath:
Expand All @@ -104,6 +109,7 @@ describe("cleanupImagesTask", () => {
titleFromOptions: "some-file",
imagesPath: "images",
specPath: "some/spec/path",
currentRetryNumber: 0,
});
return path.join(
projectRoot,
Expand Down Expand Up @@ -180,6 +186,7 @@ describe("compareImagesTask", () => {
expect(
compareImagesTask(await generateConfig({ updateImages: true }))
).resolves.toEqual({
error: false,
message:
"Image diff factor (0%) is within boundaries of maximum threshold option 0.5.",
imgDiff: 0,
Expand All @@ -198,6 +205,7 @@ describe("compareImagesTask", () => {
await fs.unlink(cfg.imgOld);

await expect(compareImagesTask(cfg)).resolves.toEqual({
error: false,
message:
"Image diff factor (0%) is within boundaries of maximum threshold option 0.5.",
imgDiff: 0,
Expand All @@ -207,6 +215,26 @@ describe("compareImagesTask", () => {
maxDiffThreshold: 0.5,
});
});

describe("when createMissingImages=false", () => {
it("rejects with error message", async () => {
const cfg = await generateConfig({
updateImages: false,
createMissingImages: false,
});
await fs.unlink(cfg.imgOld);

await expect(compareImagesTask(cfg)).resolves.toEqual({
error: true,
message: `Baseline image is missing at path: "${cfg.imgOld}". Provide a baseline image or enable "createMissingImages" option in plugin configuration.`,
imgDiff: 0,
imgDiffBase64: "",
imgNewBase64: "",
imgOldBase64: "",
maxDiffThreshold: 0.5,
});
});
});
});

describe("when old screenshot exists", () => {
Expand Down
39 changes: 21 additions & 18 deletions src/task.hook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export type CompareImagesCfg = {
title: string;
imgNew: string;
imgOld: string;
createMissingImages: boolean;
updateImages: boolean;
maxDiffThreshold: number;
diffConfig: PixelmatchOptions;
Expand Down Expand Up @@ -130,15 +131,6 @@ export const compareImagesTask = async (
cfg.imgNew.replace(FILE_SUFFIX.actual, FILE_SUFFIX.diff),
diffBuffer
);
return {
error,
message: messages.join("\n"),
imgDiff,
imgNewBase64,
imgDiffBase64,
imgOldBase64,
maxDiffThreshold: cfg.maxDiffThreshold,
};
} else {
if (rawImgOld && !isImageCurrentVersion(rawImgOldBuffer)) {
writePNG(cfg.imgNew, rawImgNewBuffer);
Expand All @@ -154,19 +146,30 @@ export const compareImagesTask = async (
imgNewBase64 = "";
imgDiffBase64 = "";
imgOldBase64 = "";
writePNG(cfg.imgNew, rawImgNewBuffer);
moveFile.sync(cfg.imgNew, cfg.imgOld);
if (cfg.createMissingImages) {
writePNG(cfg.imgNew, rawImgNewBuffer);
moveFile.sync(cfg.imgNew, cfg.imgOld);
} else {
error = true;
messages.unshift(
`Baseline image is missing at path: "${cfg.imgOld}". Provide a baseline image or enable "createMissingImages" option in plugin configuration.`
);
}
}

if (typeof imgDiff !== "undefined") {
messages.unshift(
`Image diff factor (${round(
imgDiff
)}%) is within boundaries of maximum threshold option ${
cfg.maxDiffThreshold
}.`
);
if (!error) {
messages.unshift(
`Image diff factor (${round(
imgDiff
)}%) is within boundaries of maximum threshold option ${
cfg.maxDiffThreshold
}.`
);
}

return {
error,
message: messages.join("\n"),
imgDiff,
imgNewBase64,
Expand Down