From b8b7beb0998635f2637b744a7b7551e2dff2bebe Mon Sep 17 00:00:00 2001 From: Zhirnoff Date: Tue, 21 May 2024 13:53:42 +0300 Subject: [PATCH 1/4] - updated version of indigo --- package-lock.json | 6 +++--- packages/ketcher-standalone/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2073cf8dd3..93f3b62e9c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15204,9 +15204,9 @@ } }, "node_modules/indigo-ketcher": { - "version": "1.20.0-rc.2", + "version": "1.21.0-dev.3", "resolved": "https://registry.npmjs.org/indigo-ketcher/-/indigo-ketcher-1.20.0-rc.2.tgz", - "integrity": "sha512-z0jf9f08C0IOfN9lLEzFwk/5MtODmaEtVwTsIDT444gjcPBsWkrqcv0B9GQuanA58CJhFbANuUivQjgxyqXuTQ==" + "integrity": "sha512-sVf8YUU8jqGU/b/gajcLKPW0IhqSltuYZIgHHfmpuMItLu8DoiefEQH4UqCc6ATSm5DtZxj8gtdKrfydqc0YYQ==" }, "node_modules/inflight": { "version": "1.0.6", @@ -34755,7 +34755,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", - "indigo-ketcher": "1.20.0-rc.2", + "indigo-ketcher": "1.21.0-dev.3", "ketcher-core": "*" }, "devDependencies": { diff --git a/packages/ketcher-standalone/package.json b/packages/ketcher-standalone/package.json index 48cce0f1ff..b8c08bf14c 100644 --- a/packages/ketcher-standalone/package.json +++ b/packages/ketcher-standalone/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@babel/runtime": "^7.17.9", - "indigo-ketcher": "1.20.0-rc.2", + "indigo-ketcher": "1.21.0-dev.3", "ketcher-core": "*" }, "devDependencies": { From 9e4a74e756c71e5d38309f44062c5f1262417c6b Mon Sep 17 00:00:00 2001 From: Zhirnoff Date: Tue, 21 May 2024 14:15:31 +0300 Subject: [PATCH 2/4] - updated package-lock --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 93f3b62e9c..6772b9cfb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15205,7 +15205,7 @@ }, "node_modules/indigo-ketcher": { "version": "1.21.0-dev.3", - "resolved": "https://registry.npmjs.org/indigo-ketcher/-/indigo-ketcher-1.20.0-rc.2.tgz", + "resolved": "https://registry.npmjs.org/indigo-ketcher/-/indigo-ketcher-1.21.0-dev.3.tgz", "integrity": "sha512-sVf8YUU8jqGU/b/gajcLKPW0IhqSltuYZIgHHfmpuMItLu8DoiefEQH4UqCc6ATSm5DtZxj8gtdKrfydqc0YYQ==" }, "node_modules/inflight": { From 2ecdd2c114d73c50f868079bbddee87f121328a7 Mon Sep 17 00:00:00 2001 From: Zhirnoff Date: Tue, 21 May 2024 14:29:51 +0300 Subject: [PATCH 3/4] - increased test time for 'toggle-explicit-hydrogens'; - deleted 'test.fail()' --- ...licit-hydrogens-with-respect-to-selected-atoms.spec.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ketcher-autotests/tests/Indigo-Tools/Toggle-Explicit-Hydrogens-With-Respect-To-Selected-Atoms/toggle-explicit-hydrogens-with-respect-to-selected-atoms.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Toggle-Explicit-Hydrogens-With-Respect-To-Selected-Atoms/toggle-explicit-hydrogens-with-respect-to-selected-atoms.spec.ts index dafa1f1822..3925809c65 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Toggle-Explicit-Hydrogens-With-Respect-To-Selected-Atoms/toggle-explicit-hydrogens-with-respect-to-selected-atoms.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Toggle-Explicit-Hydrogens-With-Respect-To-Selected-Atoms/toggle-explicit-hydrogens-with-respect-to-selected-atoms.spec.ts @@ -341,10 +341,8 @@ test.describe('1. User can expand hydrogens for ', () => { for (const fileName of fileNames) { test(`by ${fileName}`, async ({ page }) => { if (temporaryFailedTestsFileNames.includes(fileName)) { - test.fail(); + test.setTimeout(150000); } - - test.setTimeout(120000); // Performance degradation problem - https://github.com/epam/Indigo/issues/1835 - REMOVE AFTER FIX await openFileAndAddToCanvasAsNewProject( `KET/Toggle-Explicit-Hydrogens-With-Respect-To-Selected-Atoms/All types of bond/${fileName}`, @@ -656,10 +654,8 @@ test.describe('2. User can expand hydrogens for ', () => { for (const fileName of fileNames) { test(`by ${fileName}`, async ({ page }) => { if (temporaryFailedTestsFileNames.includes(fileName)) { - test.fail(); + test.setTimeout(150000); } - - test.setTimeout(120000); // Performance degradation problem - https://github.com/epam/Indigo/issues/1835 - REMOVE AFTER FIX await openFileAndAddToCanvasAsNewProject( `KET/Toggle-Explicit-Hydrogens-With-Respect-To-Selected-Atoms/A on the canvas/${fileName}`, From 1e329e4b84ef66ddb7185c6624d762f74f8f0f8b Mon Sep 17 00:00:00 2001 From: Zhirnoff Date: Tue, 21 May 2024 15:52:50 +0300 Subject: [PATCH 4/4] - updated 1 tested file from 'cml-files.spec.ts' --- .../tests/test-data/CML/cml-1948-r-group-expected.cml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ketcher-autotests/tests/test-data/CML/cml-1948-r-group-expected.cml b/ketcher-autotests/tests/test-data/CML/cml-1948-r-group-expected.cml index 955e76dd04..dc1a61999f 100644 --- a/ketcher-autotests/tests/test-data/CML/cml-1948-r-group-expected.cml +++ b/ketcher-autotests/tests/test-data/CML/cml-1948-r-group-expected.cml @@ -52,7 +52,7 @@ - 1 + 1