From cbb61b92636985e7dec5dab8a4d01ba5478a37e7 Mon Sep 17 00:00:00 2001 From: Nikita Chistousov Date: Fri, 30 Aug 2024 14:13:46 +0200 Subject: [PATCH] Bump 2.22 release version to public (#5391) --------- Co-authored-by: Roman Rodionov --- .../calculate-cip-tool.spec.ts | 2 +- .../functional-group-tools.spec.ts | 4 ++-- ketcher-autotests/tests/utils/canvas/helpers.ts | 13 +++++++++++-- package-lock.json | 16 ++++++++-------- packages/ketcher-core/package.json | 2 +- packages/ketcher-macromolecules/package.json | 2 +- packages/ketcher-react/package.json | 2 +- packages/ketcher-standalone/package.json | 4 ++-- 8 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts index 755ddc4fdd..2564e03bae 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts @@ -36,7 +36,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { }); test.afterEach(async ({ page }) => { - await takeEditorScreenshot(page); + await takeEditorScreenshot(page, { maxDiffPixels: 1 }); }); test('Operation with a structure without stereo properties', async ({ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts index e8155f5335..5751fc74be 100644 --- a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts +++ b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts @@ -580,14 +580,14 @@ test.describe('Templates - Functional Group Tools3', () => { await page.getByPlaceholder('Search by elements...').click(); await page.keyboard.press('C'); await page.keyboard.press('2'); - await takeEditorScreenshot(page); + await takeEditorScreenshot(page, { maxDiffPixels: 1 }); await page.getByRole('banner').getByRole('button').click(); await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); await page.getByPlaceholder('Search by elements...').click(); await page.keyboard.press('Y'); - await takeEditorScreenshot(page); + await takeEditorScreenshot(page, { maxDiffPixels: 1 }); }); test('Expand/Remove abbreviation context menu with selected tools', async ({ diff --git a/ketcher-autotests/tests/utils/canvas/helpers.ts b/ketcher-autotests/tests/utils/canvas/helpers.ts index 64b2ad319e..1ab115d4c8 100644 --- a/ketcher-autotests/tests/utils/canvas/helpers.ts +++ b/ketcher-autotests/tests/utils/canvas/helpers.ts @@ -153,7 +153,11 @@ export async function screenshotDialog(page: Page, dialogId: string) { export async function takeElementScreenshot( page: Page, elementId: string, - options?: { masks?: Locator[]; maxDiffPixelRatio?: number }, + options?: { + masks?: Locator[]; + maxDiffPixelRatio?: number; + maxDiffPixels?: number; + }, ) { const maxTimeout = 3000; const element = page.getByTestId(elementId).first(); @@ -161,6 +165,7 @@ export async function takeElementScreenshot( await expect(element).toHaveScreenshot({ mask: options?.masks, maxDiffPixelRatio: options?.maxDiffPixelRatio, + maxDiffPixels: options?.maxDiffPixels, }); } @@ -225,7 +230,11 @@ export async function takeMonomerLibraryScreenshot( export async function takeEditorScreenshot( page: Page, - options?: { masks?: Locator[]; maxDiffPixelRatio?: number }, + options?: { + masks?: Locator[]; + maxDiffPixelRatio?: number; + maxDiffPixels: number; + }, ) { await takeElementScreenshot(page, 'ketcher-canvas', options); } diff --git a/package-lock.json b/package-lock.json index 8be7ba9918..ae1145d6d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15206,9 +15206,9 @@ } }, "node_modules/indigo-ketcher": { - "version": "1.21.0-rc.3", - "resolved": "https://registry.npmjs.org/indigo-ketcher/-/indigo-ketcher-1.21.0-rc.3.tgz", - "integrity": "sha512-SY9yT1cAvUvqwqxzfAdNyXbt6owTVNQy3XZ97qfGZCc2EBqxKXJ6XEMXgsEZCs5BD2CINVLCvsrt4YoOHzcMCA==" + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/indigo-ketcher/-/indigo-ketcher-1.21.0.tgz", + "integrity": "sha512-V1/FzH0Fg0T5IwwtTxx2Grg2UjHaDUCdMG33Evb0dsi4eO8ivXgeX8UKuCUPNbuz39EaNSOs2KZY7WheG5CG+g==" }, "node_modules/inflight": { "version": "1.0.6", @@ -31460,7 +31460,7 @@ } }, "packages/ketcher-core": { - "version": "2.22.0-rc.9", + "version": "2.22.0", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -31586,7 +31586,7 @@ "dev": true }, "packages/ketcher-macromolecules": { - "version": "2.22.0-rc.9", + "version": "2.22.0", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -33015,7 +33015,7 @@ } }, "packages/ketcher-react": { - "version": "2.22.0-rc.9", + "version": "2.22.0", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -34750,11 +34750,11 @@ } }, "packages/ketcher-standalone": { - "version": "2.22.0-rc.9", + "version": "2.22.0", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", - "indigo-ketcher": "1.21.0-rc.3", + "indigo-ketcher": "1.21.0", "ketcher-core": "*" }, "devDependencies": { diff --git a/packages/ketcher-core/package.json b/packages/ketcher-core/package.json index 45d641d822..998e1d07e3 100644 --- a/packages/ketcher-core/package.json +++ b/packages/ketcher-core/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-core", - "version": "2.22.0-rc.9", + "version": "2.22.0", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-macromolecules/package.json b/packages/ketcher-macromolecules/package.json index 4f65907c27..c4bea1eda0 100644 --- a/packages/ketcher-macromolecules/package.json +++ b/packages/ketcher-macromolecules/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-macromolecules", - "version": "2.22.0-rc.9", + "version": "2.22.0", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-react/package.json b/packages/ketcher-react/package.json index e2cb365448..6acb6384e7 100644 --- a/packages/ketcher-react/package.json +++ b/packages/ketcher-react/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-react", - "version": "2.22.0-rc.9", + "version": "2.22.0", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-standalone/package.json b/packages/ketcher-standalone/package.json index be7154970a..a66f706d1c 100644 --- a/packages/ketcher-standalone/package.json +++ b/packages/ketcher-standalone/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-standalone", - "version": "2.22.0-rc.9", + "version": "2.22.0", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", @@ -42,7 +42,7 @@ }, "dependencies": { "@babel/runtime": "^7.17.9", - "indigo-ketcher": "1.21.0-rc.3", + "indigo-ketcher": "1.21.0", "ketcher-core": "*" }, "devDependencies": {