From 1e6382f9604c4d269dc4a58f6bebd1afebf87595 Mon Sep 17 00:00:00 2001 From: Jakub Freisler Date: Sun, 4 Dec 2022 23:43:36 +0100 Subject: [PATCH 1/2] feat: change attempt separator to _ resolves #196 Signed-off-by: Jakub Freisler --- ...nd #0.png => HelloWorld.cy.js playground_#0.png} | Bin ...nd #1.png => HelloWorld.cy.js playground_#1.png} | Bin ...=> My First Test Visits the app root url_#0.png} | Bin src/screenshotPath.utils.ts | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) rename example/cypress/component/__image_snapshots__/{HelloWorld.cy.js playground #0.png => HelloWorld.cy.js playground_#0.png} (100%) rename example/cypress/component/__image_snapshots__/{HelloWorld.cy.js playground #1.png => HelloWorld.cy.js playground_#1.png} (100%) rename example/cypress/e2e/__image_snapshots__/{My First Test Visits the app root url #0.png => My First Test Visits the app root url_#0.png} (100%) diff --git a/example/cypress/component/__image_snapshots__/HelloWorld.cy.js playground #0.png b/example/cypress/component/__image_snapshots__/HelloWorld.cy.js playground_#0.png similarity index 100% rename from example/cypress/component/__image_snapshots__/HelloWorld.cy.js playground #0.png rename to example/cypress/component/__image_snapshots__/HelloWorld.cy.js playground_#0.png diff --git a/example/cypress/component/__image_snapshots__/HelloWorld.cy.js playground #1.png b/example/cypress/component/__image_snapshots__/HelloWorld.cy.js playground_#1.png similarity index 100% rename from example/cypress/component/__image_snapshots__/HelloWorld.cy.js playground #1.png rename to example/cypress/component/__image_snapshots__/HelloWorld.cy.js playground_#1.png diff --git a/example/cypress/e2e/__image_snapshots__/My First Test Visits the app root url #0.png b/example/cypress/e2e/__image_snapshots__/My First Test Visits the app root url_#0.png similarity index 100% rename from example/cypress/e2e/__image_snapshots__/My First Test Visits the app root url #0.png rename to example/cypress/e2e/__image_snapshots__/My First Test Visits the app root url_#0.png diff --git a/src/screenshotPath.utils.ts b/src/screenshotPath.utils.ts index e97efd63..dc3ca2b2 100644 --- a/src/screenshotPath.utils.ts +++ b/src/screenshotPath.utils.ts @@ -66,12 +66,12 @@ export const generateScreenshotPath = ({ return path.join( IMAGE_SNAPSHOT_PREFIX, - `${screenshotPath} #${nameCacheCounter[screenshotPath]}${FILE_SUFFIX.actual}.png` + `${screenshotPath}_#${nameCacheCounter[screenshotPath]}${FILE_SUFFIX.actual}.png` ); }; const screenshotPathRegex = new RegExp( - `^([\\s\\S]+?) #([0-9]+)(?:(?:\\${FILE_SUFFIX.diff})|(?:\\${FILE_SUFFIX.actual}))?\\.(?:png|PNG)$` + `^([\\s\\S]+?)_#([0-9]+)(?:(?:\\${FILE_SUFFIX.diff})|(?:\\${FILE_SUFFIX.actual}))?\\.(?:png|PNG)$` ); export const wasScreenshotUsed = (imagePath: string) => { const matched = imagePath.match(screenshotPathRegex); From 5c7d81e331d58e3bc9d3a09a233f137245b93cc9 Mon Sep 17 00:00:00 2001 From: Jakub Freisler Date: Sun, 4 Dec 2022 23:55:22 +0100 Subject: [PATCH 2/2] chore: update tests Signed-off-by: Jakub Freisler --- src/task.hook.test.ts | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/task.hook.test.ts b/src/task.hook.test.ts index 3a436b03..51e7893f 100644 --- a/src/task.hook.test.ts +++ b/src/task.hook.test.ts @@ -48,11 +48,12 @@ describe("getScreenshotPathInfoTask", () => { titleFromOptions: "some-title-withśpęćiał人物", imagesPath: "nested/images/dir", specPath, + currentRetryNumber: 0, }) ).toEqual({ screenshotPath: - "__cp-visual-regression-diff_snapshots__/nested/images/dir/some-title-withśpęćiał人物 #0.actual.png", - title: "some-title-withśpęćiał人物 #0.actual", + "__cp-visual-regression-diff_snapshots__/nested/images/dir/some-title-withśpęćiał人物_#0.actual.png", + title: "some-title-withśpęćiał人物_#0.actual", }); }); @@ -62,11 +63,12 @@ describe("getScreenshotPathInfoTask", () => { titleFromOptions: "some-title", imagesPath: "{spec_path}/images/dir", specPath, + currentRetryNumber: 0, }) ).toEqual({ screenshotPath: - "__cp-visual-regression-diff_snapshots__/some/nested/spec-path/images/dir/some-title #0.actual.png", - title: "some-title #0.actual", + "__cp-visual-regression-diff_snapshots__/some/nested/spec-path/images/dir/some-title_#0.actual.png", + title: "some-title_#0.actual", }); }); @@ -76,11 +78,12 @@ describe("getScreenshotPathInfoTask", () => { titleFromOptions: "some-title", imagesPath: "/images/dir", specPath, + currentRetryNumber: 0, }) ).toEqual({ screenshotPath: - "__cp-visual-regression-diff_snapshots__/{unix_system_root_path}/images/dir/some-title #0.actual.png", - title: "some-title #0.actual", + "__cp-visual-regression-diff_snapshots__/{unix_system_root_path}/images/dir/some-title_#0.actual.png", + title: "some-title_#0.actual", }); expect( @@ -88,11 +91,12 @@ describe("getScreenshotPathInfoTask", () => { titleFromOptions: "some-title", imagesPath: "C:/images/dir", specPath, + currentRetryNumber: 0, }) ).toEqual({ screenshotPath: - "__cp-visual-regression-diff_snapshots__/{win_system_root_path}/C/images/dir/some-title #0.actual.png", - title: "some-title #0.actual", + "__cp-visual-regression-diff_snapshots__/{win_system_root_path}/C/images/dir/some-title_#0.actual.png", + title: "some-title_#0.actual", }); }); }); @@ -104,6 +108,7 @@ describe("cleanupImagesTask", () => { titleFromOptions: "some-file", imagesPath: "images", specPath: "some/spec/path", + currentRetryNumber: 0, }); return path.join( projectRoot, @@ -131,7 +136,7 @@ describe("cleanupImagesTask", () => { it("removes unused screenshot", async () => { const { path: projectRoot } = await dir(); const screenshotPath = await writeTmpFixture( - path.join(projectRoot, "some-file-2 #0.png"), + path.join(projectRoot, "some-file-2_#0.png"), oldImgFixture );