diff --git a/ketcher-autotests/playwright.config.ts b/ketcher-autotests/playwright.config.ts index d63d0f7e6d..498e39d05c 100644 --- a/ketcher-autotests/playwright.config.ts +++ b/ketcher-autotests/playwright.config.ts @@ -67,7 +67,7 @@ const config: PlaywrightTestConfig = { /* Run tests in files in parallel */ fullyParallel: true, /* Fail the build on CI if you accidentally left test.only in the source code. */ - forbidOnly: Boolean(process.env.CI), + forbidOnly: Boolean(process.env.CI_ENVIRONMENT), /* Retry on CI only */ retries: isCI ? MAX_NUMBER_OF_RETRIES : 0, /* Opt out of parallel tests on CI. */ diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/save-file.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/save-file.spec.ts index a261d10aa1..95fde41d3c 100644 --- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/save-file.spec.ts +++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/save-file.spec.ts @@ -78,12 +78,12 @@ test('Save file - Save *.ket file', async ({ page }) => { ); const expectedFile = await getKet(page); - await saveToFile('Ket/ket-2934-to-compare-expected.ket', expectedFile); + await saveToFile('KET/ket-2934-to-compare-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, - expectedFileName: 'tests/test-data/Ket/ket-2934-to-compare-expected.ket', + expectedFileName: 'tests/test-data/KET/ket-2934-to-compare-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts index 10191d1220..b4f0e679e4 100644 --- a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts +++ b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts @@ -276,7 +276,7 @@ test.describe('SMILES files', () => { Description: Structure is correctly opens from saved files. Keep only first reaction arrow and keep all structures (all intermediate structures should be products and the arrow is replaced by a plus) */ - await openFileAndAddToCanvas('Ket/two-arrows-and-plus.ket', page); + await openFileAndAddToCanvas('KET/two-arrows-and-plus.ket', page); await getAndCompareSmiles( page, 'tests/test-data/smiles-two-arrows-and-plus-expected.json', @@ -299,7 +299,7 @@ test.describe('SMILES files', () => { Description: Structure is not distorted. Reagent NH3 located above reaction arrow. */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); await getAndCompareSmiles( 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 9150abfde9..ee5e871504 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 @@ -46,7 +46,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { Test case: EPMLSOPKET-1886 Description: The structure isn`t changed. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectTopPanelButton(TopPanelButton.Calculate, page); }); @@ -355,7 +355,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); const expectedFile = await getKet(page); await saveToFile( - 'Ket/structure-with-stereo-bonds-expected.ket', + 'KET/structure-with-stereo-bonds-expected.ket', expectedFile, ); await selectTopPanelButton(TopPanelButton.Calculate, page); @@ -363,7 +363,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/structure-with-stereo-bonds-expected.ket', + 'tests/test-data/KET/structure-with-stereo-bonds-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts index b6a7544654..ebc523723d 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts @@ -32,7 +32,7 @@ test.describe('Calculated Values Tools', () => { Description: The 'Calculated Values' modal window is opened, the 'Chemical Formula' field contains 'C7H16' value. */ - await openFileAndAddToCanvas('Ket/calculated-values-chain.ket', page); + await openFileAndAddToCanvas('KET/calculated-values-chain.ket', page); await selectTopPanelButton(TopPanelButton.Calculated, page); }); @@ -615,7 +615,7 @@ test.describe('Calculated Values Tools', () => { */ const xDelta = 500; const yDelta = 800; - await openFileAndAddToCanvas('Ket/reaction-arrow.ket', page); + await openFileAndAddToCanvas('KET/reaction-arrow.ket', page); const { x, y } = await getCoordinatesOfTheMiddleOfTheScreen(page); await dragMouseTo(x - xDelta, y + yDelta, page); await selectTopPanelButton(TopPanelButton.Calculated, page); diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts index 992b073f7b..98715c1f1a 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts @@ -224,7 +224,7 @@ test.describe('Indigo Tools - Clean Tools', () => { The Clean Up action is applied correctly and simultaneously to the whole structure with stereolabels. */ - await openFileAndAddToCanvas('Ket/stereolabels.ket', page); + await openFileAndAddToCanvas('KET/stereolabels.ket', page); await selectTopPanelButton(TopPanelButton.Clean, page); await delay(DELAY_IN_SECONDS.SEVEN); diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts index 375a20ad5f..9efe200b55 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts @@ -202,7 +202,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { - the selected stereocenters have different stereo marks. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectLeftPanelButton(LeftPanelButton.Stereochemistry, page); @@ -254,15 +254,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('Ket/stereo-and-structure.ket', page); + await openFileAndAddToCanvas('KET/stereo-and-structure.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/stereo-and-structure-expected.ket', expectedFile); + await saveToFile('KET/stereo-and-structure-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/stereo-and-structure-expected.ket', + 'tests/test-data/KET/stereo-and-structure-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -281,15 +281,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('Ket/stereo-or-structure.ket', page); + await openFileAndAddToCanvas('KET/stereo-or-structure.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/stereo-or-structure-expected.ket', expectedFile); + await saveToFile('KET/stereo-or-structure-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/stereo-or-structure-expected.ket', + 'tests/test-data/KET/stereo-or-structure-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -308,15 +308,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('Ket/stereo-mixed-structure.ket', page); + await openFileAndAddToCanvas('KET/stereo-mixed-structure.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/stereo-mixed-structure-expected.ket', expectedFile); + await saveToFile('KET/stereo-mixed-structure-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/stereo-mixed-structure-expected.ket', + 'tests/test-data/KET/stereo-mixed-structure-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -339,13 +339,13 @@ test.describe('Enhanced Stereochemistry Tool', () => { */ await openFileAndAddToCanvas('mixed-and-stereomarks.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/mixed-and-stereomarks-expected.ket', expectedFile); + await saveToFile('KET/mixed-and-stereomarks-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/mixed-and-stereomarks-expected.ket', + 'tests/test-data/KET/mixed-and-stereomarks-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -366,15 +366,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('Ket/mixed-or-stereomarks.ket', page); + await openFileAndAddToCanvas('KET/mixed-or-stereomarks.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/mixed-or-stereomarks-expected.ket', expectedFile); + await saveToFile('KET/mixed-or-stereomarks-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/mixed-or-stereomarks-expected.ket', + 'tests/test-data/KET/mixed-or-stereomarks-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -392,7 +392,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: The '&1' and 'or1' and 'abs' stereo marks appear next to the selected stereocenter. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectLabelDisplayAtStereogenicCenters(page, 'Classic'); @@ -404,7 +404,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: The '&1' and 'or1' and 'abs' stereo marks appear next to the selected stereocenter. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectLabelDisplayAtStereogenicCenters(page, 'On'); @@ -416,7 +416,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: Only stereo flag displays near the structure. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectLabelDisplayAtStereogenicCenters(page, 'Off'); @@ -428,7 +428,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: When 'Off' is selected - Stereobonds and stereo labels are displayed in black. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectColorOfStereogenicCenters(page, 'Off'); @@ -440,7 +440,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: When 'Labels and Bonds' is selected - Stereobonds and stereo labels are displayed in color. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectColorOfStereogenicCenters(page, 'Labels and Bonds'); @@ -453,7 +453,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { and stereo labels are displayed in black. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectColorOfStereogenicCenters(page, 'Bonds Only'); @@ -559,7 +559,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { 'Add to OR [ ] Group' setting becomes available when at least one OR group has been created on the canvas. */ - await openFileAndAddToCanvas('Ket/mixed-and-or-structure.ket', page); + await openFileAndAddToCanvas('KET/mixed-and-or-structure.ket', page); await selectLeftPanelButton(LeftPanelButton.Stereochemistry, page); }); @@ -569,7 +569,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: Labels (&) are colored and color intensity is decreasing with the number. */ await openFileAndAddToCanvas( - 'Ket/mixed-with-eight-stereocenters.ket', + 'KET/mixed-with-eight-stereocenters.ket', page, ); await takeEditorScreenshot(page); @@ -592,7 +592,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: Stereo flag - Mixed2 */ await editMixedFlagText(page, 'Mixed2'); - await openFileAndAddToCanvas('Ket/mixed-and-stereomarks.ket', page); + await openFileAndAddToCanvas('KET/mixed-and-stereomarks.ket', page); }); test('No overlapping of Stereo flag and structure', async ({ page }) => { diff --git a/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts index 582c2ea07a..ba8490a383 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts @@ -37,7 +37,7 @@ test.describe('Indigo Tools - Layout', () => { page, }) => { // Related Github issue: https://github.com/epam/ketcher/issues/3025 - const structureWithStereoFlags = 'Ket/structure-with-stereo-flags.ket'; + const structureWithStereoFlags = 'KET/structure-with-stereo-flags.ket'; await openFileWithShift(structureWithStereoFlags, page); await selectTopPanelButton(TopPanelButton.Layout, page); await selectTopPanelButton(TopPanelButton.Layout, page); diff --git a/ketcher-autotests/tests/Reactions/Reaction-tools/Plus-and-Arrow-tools/plus-and-arrows-tools.spec.ts b/ketcher-autotests/tests/Reactions/Reaction-tools/Plus-and-Arrow-tools/plus-and-arrows-tools.spec.ts index 3fb1a4626a..477ab23609 100644 --- a/ketcher-autotests/tests/Reactions/Reaction-tools/Plus-and-Arrow-tools/plus-and-arrows-tools.spec.ts +++ b/ketcher-autotests/tests/Reactions/Reaction-tools/Plus-and-Arrow-tools/plus-and-arrows-tools.spec.ts @@ -444,7 +444,7 @@ test.describe('Plus and Arrows tools ', () => { test('open file', async ({ page }) => { await openFileAndAddToCanvas( - 'Ket/default-reaction-arrow-tool-saving.ket', + 'KET/default-reaction-arrow-tool-saving.ket', page, ); }); @@ -467,7 +467,7 @@ test.describe('Plus and Arrows tools ', () => { test('open file', async ({ page }) => { await openFileAndAddToCanvas( - 'Ket/non-default-reaction-arrow-tool-saving.ket', + 'KET/non-default-reaction-arrow-tool-saving.ket', page, ); }); @@ -563,7 +563,10 @@ test.describe('Plus and Arrows tools ', () => { await openFileAndAddToCanvas(`resizing-reaction-arrow-saving.rxn`, page); await takeEditorScreenshot(page); await selectTopPanelButton(TopPanelButton.Clear, page); - await openFileAndAddToCanvas(`resizing-reaction-arrow-saving.ket`, page); + await openFileAndAddToCanvas( + `KET/resizing-reaction-arrow-saving.ket`, + page, + ); }); }); diff --git a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts index fc16980b25..d2f2caf389 100644 --- a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts +++ b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts @@ -54,7 +54,7 @@ test.describe('Reagents CDXML format', () => { Description: System detect molecule NH3 above arrow as reagent and write reagent in 'CDXML' format in "Preview" tab */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -78,7 +78,7 @@ test.describe('Reagents CDXML format', () => { Description: System detect molecule HCl below arrow as reagent and write reagent in 'CDXML' format in "Preview" tab */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); await delay(DELAY_IN_SECONDS.THREE); @@ -103,7 +103,7 @@ test.describe('Reagents CDXML format', () => { Description: System detect text NH3 as reagent and write reagent in 'CDXML' format in "Preview" tab */ await openFileAndAddToCanvas( - 'Ket/reagent-nh3-text-above-arrow.ket', + 'KET/reagent-nh3-text-above-arrow.ket', page, ); await delay(DELAY_IN_SECONDS.THREE); @@ -128,7 +128,7 @@ test.describe('Reagents CDXML format', () => { Description: System detect text HCl below arrow as reagent and write reagent in 'CDXML' format in "Preview" tab */ await openFileAndAddToCanvas( - 'Ket/reagent-hcl-text-below-arrow.ket', + 'KET/reagent-hcl-text-below-arrow.ket', page, ); await delay(DELAY_IN_SECONDS.THREE); @@ -150,7 +150,7 @@ test.describe('Reagents CDXML format', () => { Description: File saved in format (e.g. "ketcher.cdxml") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); await delay(DELAY_IN_SECONDS.THREE); @@ -183,7 +183,7 @@ test.describe('Reagents CDXML format', () => { Description: File opens with the reagent NH3 on top of the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); }); @@ -194,7 +194,7 @@ test.describe('Reagents CDXML format', () => { Description: File opens with the reagent HCl below the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); }); diff --git a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts index e8541b7346..679ce1c0f7 100644 --- a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts +++ b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts @@ -62,7 +62,7 @@ test.describe('Reagents RXN format', () => { Description: Files are compared for reagent presence */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); const expectedFile = await getRxn(page, 'v2000'); @@ -96,7 +96,7 @@ test.describe('Reagents RXN format', () => { Description: Files are compared for reagent presence */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); const expectedFile = await getRxn(page, 'v3000'); @@ -128,7 +128,7 @@ test.describe('Reagents RXN format', () => { Description: File saved in format (e.g. "ketcher.rxn") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); const expectedFile = await getRxn(page, 'v2000'); @@ -162,7 +162,7 @@ test.describe('Reagents RXN format', () => { Description: File saved in format (e.g. "ketcher.rxn") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); const expectedFile = await getRxn(page, 'v3000'); diff --git a/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts b/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts index 3df9e85d68..c55a34398c 100644 --- a/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts +++ b/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts @@ -44,7 +44,7 @@ test.describe('Reagents SMARTS format', () => { format in "Preview" tab (e.g. [#6]-1=[#6]-[#6]=[#6]-[#6]=[#6]-1>[#7]>[#6]-1=[#6]-[#6]=[#6]-[#6]=[#6]-1) */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -69,7 +69,7 @@ test.describe('Reagents SMARTS format', () => { ) */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); @@ -129,7 +129,7 @@ test.describe('Reagents SMARTS format', () => { Description: File saved in format (e.g. "ketcher.smarts") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); diff --git a/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts b/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts index e1cce9c041..6f1cdaaf4f 100644 --- a/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts +++ b/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts @@ -61,7 +61,7 @@ test.describe('Reagents SMILES format', () => { where specifying reactant, agent and product molecule(s) separated by the "greater-than" symbol ('>'). */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -84,7 +84,10 @@ test.describe('Reagents SMILES format', () => { format in "Preview" tab (e.g. C1(C)C(O)=CC(S)=C(N)C=1>Cl>C1(Br)C(C)=CC(I)=C(O)C=1 where specifying reactant, agent and product molecule(s) separated by the "greater-than" symbol ('>'). */ - await openFileAndAddToCanvas('benzene-arrow-benzene-reagent-hcl.ket', page); + await openFileAndAddToCanvas( + 'KET/benzene-arrow-benzene-reagent-hcl.ket', + page, + ); const smiFileExpected = await readFileContents( 'tests/test-data/daylight-smiles-below-expected.smi', @@ -106,7 +109,7 @@ test.describe('Reagents SMILES format', () => { where specifying reactant, agent and product molecule(s) separated by the "greater-than" symbol ('>'). */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -123,7 +126,10 @@ test.describe('Reagents SMILES format', () => { format in "Preview" tab (e.g. C1(C)C(O)=CC(S)=C(N)C=1>Cl>C1(Br)C(C)=CC(I)=C(O)C=1 where specifying reactant, agent and product molecule(s) separated by the "greater-than" symbol ('>'). */ - await openFileAndAddToCanvas('benzene-arrow-benzene-reagent-hcl.ket', page); + await openFileAndAddToCanvas( + 'KET/benzene-arrow-benzene-reagent-hcl.ket', + page, + ); await getPreviewForSmiles(page, 'MDL Rxnfile V2000', 'Extended SMILES'); }); @@ -189,7 +195,7 @@ test.describe('Reagents SMILES format', () => { Description: File saved in format (e.g. "ketcher.smi") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -208,7 +214,7 @@ test.describe('Reagents SMILES format', () => { Description: File saved in format (e.g. "ketcher.cxsmi") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); diff --git a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts index ec0909089f..4cbd81accb 100644 --- a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts +++ b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts @@ -44,7 +44,7 @@ test.describe('Reagents molecule above arrow', () => { Description: File is shown in the preview with the NH3 reagent above the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -60,7 +60,7 @@ test.describe('Reagents molecule above arrow', () => { Description: File is shown in the preview with the NH3 reagent above the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); await selectTopPanelButton(TopPanelButton.Save, page); diff --git a/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts b/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts index 76a38d1bf5..567831ff37 100644 --- a/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts +++ b/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts @@ -42,7 +42,7 @@ test.describe('Reagents molecule below arrow', () => { Description: File is shown in the preview with the HCl reagent below the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); await selectTopPanelButton(TopPanelButton.Save, page); @@ -56,7 +56,7 @@ test.describe('Reagents molecule below arrow', () => { Description: File is shown in the preview with the HCl reagent below the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts index 201e3937de..5cc7c12fba 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts @@ -223,10 +223,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1632 Description: User is able to remove the attachment points. */ - await openFileAndAddToCanvas( - 'Ket/Ket/chain-with-attachment-points.ket', - page, - ); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await selectNestedTool(page, RgroupTool.ATTACHMENT_POINTS); await setAttachmentPoints( page, @@ -255,7 +252,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1644 Description: The attachment point's asterisk is colored with the same color as the atom symbol. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await selectAtomInToolbar(AtomButton.Nitrogen, page); await clickOnAtom(page, 'C', 2); @@ -273,7 +270,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1644 Description: The Not List atom, Any Atom, Group Generics is attached to attachment points. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await selectNotListAtoms(page); await clickOnAtom(page, 'C', 2); @@ -290,7 +287,7 @@ test.describe('Attachment Point Tool', () => { Description: Attachment points are created correctly if the reaction arrow and plus sign(s) are present on the canvas. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectNestedTool(page, RgroupTool.ATTACHMENT_POINTS); await setAttachmentPoints( @@ -321,7 +318,7 @@ test.describe('Attachment Point Tool', () => { Description: Pasted structures are displayed with correct attachment points. Undo/Redo actions for each step are correct. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await copyAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); @@ -334,7 +331,7 @@ test.describe('Attachment Point Tool', () => { Description: Pasted structures are displayed with correct attachment points. Undo/Redo actions for each step are correct. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await cutAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); @@ -347,7 +344,7 @@ test.describe('Attachment Point Tool', () => { Description: Pasted structures are displayed with the correct attachment points. Undo/Redo actions for each step are correct. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await copyAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); }); @@ -360,7 +357,7 @@ test.describe('Attachment Point Tool', () => { */ const x = 0; const y = 300; - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await cutAndPaste(page); await page.mouse.click(x, y); @@ -372,7 +369,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1651 Description: Structure with attachment points saved as .mol file */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getMolfile(page); await saveToFile('chain-with-attachment-points-expected.mol', expectedFile); const METADATA_STRING_INDEX = [1]; @@ -392,7 +389,7 @@ test.describe('Attachment Point Tool', () => { Description: Click the 'Save As' button, and click the 'Save' button. Open the saved *.mol file and edit it in any way. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getMolfile(page); await saveToFile('chain-with-attachment-points-expected.mol', expectedFile); await openFile('chain-with-attachment-points-expected.mol', page); @@ -412,7 +409,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1651 Description: Structure with attachment points saved as .mol file V3000 */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getMolfile(page, 'v3000'); await saveToFile( 'chain-with-attachment-points-expectedV3000.mol', @@ -435,7 +432,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1652 Description: Structure with attachment points saved as .rxn file */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); const expectedFile = await getRxn(page); await saveToFile('reaction-with-arrow-and-plus-expected.rxn', expectedFile); @@ -456,7 +453,7 @@ test.describe('Attachment Point Tool', () => { Description: Click the 'Save As' button and click the 'Save' button. Open the saved *.rxn file and edit it in any way. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); const expectedFile = await getRxn(page); await saveToFile('reaction-with-arrow-and-plus-expected.rxn', expectedFile); await openFile('reaction-with-arrow-and-plus-expected.rxn', page); @@ -477,7 +474,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1652 Description: Structure with attachment points saved as .rxn file V3000 */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); const expectedFile = await getRxn(page, 'v3000'); await saveToFile( 'reaction-with-arrow-and-plus-expectedV3000.rxn', @@ -501,7 +498,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1653 Description: Structure with attachment points saved as .smi file */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getSmiles(page); await saveToFile('chain-with-attachment-points-expected.smi', expectedFile); @@ -524,7 +521,7 @@ test.describe('Attachment Point Tool', () => { Click the 'Save As' button, save as CML file. Open the saved *.cml file and edit it in any way. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getSmiles(page); await saveToFile('chain-with-attachment-points-expected.smi', expectedFile); await openFile('chain-with-attachment-points-expected.smi', page); @@ -570,7 +567,7 @@ test.describe('Attachment Point Tool', () => { x: 20, y: 160, }; - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await page.keyboard.press('Control+a'); const coordinates = await getRotationHandleCoordinates(page); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts index 29516e8cd9..471d66d951 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts @@ -297,7 +297,7 @@ test.describe('R-Group Label Tool', () => { const x = 500; const y = 200; const anyAtom = 3; - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectLeftPanelButton(LeftPanelButton.R_GroupLabelTool, page); await clickOnAtom(page, 'C', anyAtom); await pressButton(page, 'R8'); @@ -318,7 +318,7 @@ test.describe('R-Group Label Tool', () => { const x = 500; const y = 200; const anyAtom = 3; - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectLeftPanelButton(LeftPanelButton.R_GroupLabelTool, page); await clickOnAtom(page, 'C', anyAtom); await pressButton(page, 'R8'); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts index f4901d23e7..dc4ce4f0fb 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts @@ -129,7 +129,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1511 Description: User is able to edit the Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await editSGroupProperties(page, '33', 'Data', 'Multiple group', '1'); }); @@ -138,7 +138,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1514 Description: User is able to copy and paste structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await copyAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); }); @@ -148,7 +148,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1514 Description: User is able to cut and paste structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await cutAndPaste(page); await clickInTheMiddleOfTheScreen(page); }); @@ -243,7 +243,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1553 Description: Data S-Group added to only structures. Not to plus sign and arrow. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectSGroupProperties( page, 'Fragment', @@ -262,7 +262,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1553 Description: Data S-Group attached to only on atoms of structures. Not to plus sign and arrow. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectSGroupProperties( page, 'Fragment', @@ -279,7 +279,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1543 Description: User is able to edit the Data S-group Field name and Field Value. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await selectSGroupProperties( page, 'Fragment', @@ -295,7 +295,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1544 Description: User is able to add atom on structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await selectAtomInToolbar(AtomButton.Oxygen, page); await clickOnAtom(page, 'C', 3); await resetCurrentTool(page); @@ -308,7 +308,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1544 Description: User is able to delete and undo/redo atom on structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await selectLeftPanelButton(LeftPanelButton.Erase, page); await clickOnAtom(page, 'C', 3); await takeEditorScreenshot(page); @@ -323,7 +323,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1544 Description: User is able to add R-Group Label and Undo/Redo on structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await selectLeftPanelButton(LeftPanelButton.R_GroupLabelTool, page); await clickOnAtom(page, 'C', 3); await pressButton(page, 'R8'); @@ -341,7 +341,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1544 Description: User is able to delete whole Chain with Data S-Group and undo/redo. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await page.keyboard.press('Control+a'); await page.getByTestId('delete').click(); await takeEditorScreenshot(page); @@ -356,7 +356,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1513 Description: User is able to delete and undo/redo by hotkeys atom on structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 3); await page.mouse.move(point.x, point.y); await page.keyboard.press('Delete'); @@ -429,7 +429,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-8907 Description: Hover over created S-Group displays tooltip for Benzene ring with Nitrogen atom */ - await openFileAndAddToCanvas('Ket/benzene-with-data-s-group.ket', page); + await openFileAndAddToCanvas('KET/benzene-with-data-s-group.ket', page); await clickInTheMiddleOfTheScreen(page); }); }); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/SRU-Polymer/sru-polymer-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/SRU-Polymer/sru-polymer-tool.spec.ts index c3d78b86e3..106cc3c381 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/SRU-Polymer/sru-polymer-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/SRU-Polymer/sru-polymer-tool.spec.ts @@ -273,7 +273,7 @@ test.describe('SRU Polymer tool', () => { Test case: EPMLSOPKET-1536 Description: User is able to save and open structure with SRU polymer S-group. */ - await openFileAndAddToCanvas('Ket/sru-polymer-data.ket', page); + await openFileAndAddToCanvas('KET/sru-polymer-data.ket', page); const expectedFile = await getMolfile(page); await saveToFile('sru-polymer-data-expected.mol', expectedFile); const METADATA_STRING_INDEX = [1]; diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts index c8abeb83c2..7d768bb5d3 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts @@ -218,7 +218,7 @@ test.describe('Superatom S-Group tool', () => { Test case: EPMLSOPKET-1541 Description: User is able to save and open structure with Superatom S-group. */ - await openFileAndAddToCanvas('Ket/superatom-all-chain.ket', page); + await openFileAndAddToCanvas('KET/superatom-all-chain.ket', page); const expectedFile = await getMolfile(page); await saveToFile('superatom-all-chain-expected.mol', expectedFile); const METADATA_STRING_INDEX = [1]; @@ -238,7 +238,7 @@ test.describe('Superatom S-Group tool', () => { Test case: EPMLSOPKET-12990 Description: User is able to contract/expand/remove abbreviation on structure with Superatom S-group. */ - await openFileAndAddToCanvas('Ket/superatom-all-chain.ket', page); + await openFileAndAddToCanvas('KET/superatom-all-chain.ket', page); await contractExpandRemoveAbbreviation(page, 'Test@!#$%12345'); }); @@ -249,7 +249,7 @@ test.describe('Superatom S-Group tool', () => { Test case: EPMLSOPKET-12991 Description: User is able to contract/expand/remove abbreviation on atom with Superatom S-group. */ - await openFileAndAddToCanvas('Ket/superatom-one-atom-on-chain.ket', page); + await openFileAndAddToCanvas('KET/superatom-one-atom-on-chain.ket', page); await contractExpandRemoveAbbreviation(page, 'Test@!#$%12345'); }); }); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/selection-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/selection-tool.spec.ts index 7576ab1fef..1998339546 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/selection-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/selection-tool.spec.ts @@ -60,7 +60,7 @@ test.describe('Selection tools', () => { Description: Selected atoms are replaces with those assigned to the hotkey. Selected tool remains active and the atom does not appear under mouse cursor. */ - await openFileAndAddToCanvas('Ket/two-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-atoms.ket', page); await page.keyboard.press('Control+a'); await page.keyboard.press('o'); }); @@ -94,7 +94,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15508 Description: All selected structures are flipped horizontally based on the selection box origin. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await page.keyboard.press('Control+a'); await pressButton(page, 'Horizontal Flip (Alt+H)'); }); @@ -106,7 +106,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15509 Description: All selected structures are flipped horizontally based on the selection box origin. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await page.keyboard.press('Control+a'); await pressButton(page, 'Vertical Flip (Alt+V)'); }); @@ -116,7 +116,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15510 Description: All selected structures are deleted from the canvas. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await page.keyboard.press('Control+a'); await page.getByTestId('delete').click(); }); @@ -129,7 +129,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 1 pixel in the corresponding direction with each key press. In this test to 50px Down. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); for (let i = 0; i < 50; i++) { @@ -145,7 +145,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 1 pixel in the corresponding direction with each key press. In this test to 50px Up. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); for (let i = 0; i < 50; i++) { @@ -161,7 +161,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 1 pixel in the corresponding direction with each key press. In this test to 50px Right. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); for (let i = 0; i < 50; i++) { @@ -177,7 +177,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 1 pixel in the corresponding direction with each key press. In this test to 50px Left. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); for (let i = 0; i < 50; i++) { @@ -193,7 +193,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 10 pixel in the corresponding direction with each key press with Shift key. In this test to 100px Down. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); await page.keyboard.down('Shift'); @@ -211,7 +211,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 10 pixel in the corresponding direction with each key press with Shift key. In this test to 100px Up. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); await page.keyboard.down('Shift'); @@ -229,7 +229,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 10 pixel in the corresponding direction with each key presswith Shift key. In this test to 100px Right. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); await page.keyboard.down('Shift'); @@ -247,7 +247,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 10 pixel in the corresponding direction with each key press with Shift key. In this test to 100px Left. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); await page.keyboard.down('Shift'); @@ -269,7 +269,7 @@ test.describe('Selection tools', () => { const pointx1 = 750; const pointy1 = 300; - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await selectLeftPanelButton(LeftPanelButton.S_Group, page); await clickOnAtom(page, 'C', 0); await fillFieldByPlaceholder(page, 'Enter name', 'Test'); @@ -325,7 +325,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15514 Description: The canvas should automatically expand in the direction the structure is being moved. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); @@ -344,7 +344,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15514 Description: The canvas should automatically expand in the direction the structure is being moved. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); @@ -363,7 +363,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15515 Description: The canvas should automatically expand in the direction the structure is being moved. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); @@ -383,7 +383,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15515 Description: The canvas should automatically expand in the direction the structure is being moved. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); @@ -404,7 +404,7 @@ test.describe('Selection tools', () => { Description: The canvas should automatically expand in the direction the structure is being moved. Structure is visible on the canvas. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts index 8a87c38d71..05cb3fcc62 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts @@ -197,7 +197,7 @@ test.describe('Atom Properties', () => { 'Cancel', 'Apply' and 'X' buttons; The 'Atom Properties' header. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'N', 0); }); @@ -223,7 +223,7 @@ test.describe('Atom Properties', () => { 'Cancel', 'Apply' and 'X' buttons; The 'Atom Properties' header. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await moveOnAtom(page, 'O', 0); await page.keyboard.press('/'); }); @@ -234,7 +234,7 @@ test.describe('Atom Properties', () => { Description: The 'Label' field contains the correct typed atom symbol. The selected carbon atom isn`t changed with 'Na' atom symbol. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectAtomLabel(page, 'Na', 'Cancel'); @@ -246,7 +246,7 @@ test.describe('Atom Properties', () => { Description: The 'Label' field contains the correct typed atom symbol. The selected carbon atom is changed with 'Sb' atom symbol. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectAtomLabel(page, 'Sb', 'Apply'); @@ -259,7 +259,7 @@ test.describe('Atom Properties', () => { The 'Label' field has a red frame. The 'Error: Wrong label' tooltip appears when the cursor is over the field. The Apply button becomes disabled. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'N', 0); await page.getByLabel('Label').fill('J%'); @@ -275,7 +275,7 @@ test.describe('Atom Properties', () => { when the cursor is over the field. The Apply button becomes disabled. The 'N' atom symbol isn`t changed with an incorrect symbol. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'N', 0); await selectAtomLabel(page, 'J%', 'Cancel'); @@ -410,7 +410,7 @@ test.describe('Atom Properties', () => { The 'Alias' field contains the correct typed characters. The selected carbon atom does not changed. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); @@ -424,7 +424,7 @@ test.describe('Atom Properties', () => { The 'Alias' field contains the correct typed characters. (for example 'abc123TesREasd!@'). The selected carbon atom is changed with typed text. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); @@ -454,7 +454,7 @@ test.describe('Atom Properties', () => { Description: In the opened dialog the 'Number' field contains the correct text (for our example - Carbon = 6). Nitrogen = 7, Oxygen = 8 */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await takeEditorScreenshot(page); @@ -477,7 +477,7 @@ test.describe('Atom Properties', () => { The '2' is present in the 'Charge' field. The '2-' symbol appears near the selected atom on top-right side. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await fillChargeForAtom(page, '1', 'Apply'); @@ -498,7 +498,7 @@ test.describe('Atom Properties', () => { The 'Error: Invalid charge value' tooltip appears when the cursor over the field. The 'Apply' button becomes disabled. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await page.getByLabel('Charge').fill('A'); @@ -569,7 +569,7 @@ test.describe('Atom Properties', () => { The 'Isotope' field contains the correct typed value. The isotope value does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await fillIsotopeForAtom(page, '18', 'Cancel'); @@ -582,7 +582,7 @@ test.describe('Atom Properties', () => { The 'Isotope' field contains the correct typed value. '13' appears near the carbon atom in top-left side. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await fillIsotopeForAtom(page, '13', 'Apply'); @@ -594,7 +594,7 @@ test.describe('Atom Properties', () => { Description: The 'Isotope' field is filled with '0' by default. Field highlight with red and tooltip appears: There must be integer! */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await page.getByLabel('Isotope').fill('b'); @@ -648,7 +648,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1617 Description: The 'Isotope' 18O added. Number colored in red as Oxygen atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await moveOnAtom(page, 'C', 1); await page.mouse.down(); @@ -690,7 +690,7 @@ test.describe('Atom Properties', () => { The 'Valence' field contains the selected value. The valence value does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectValenceForAtom(page, 'III', 'Cancel'); @@ -703,7 +703,7 @@ test.describe('Atom Properties', () => { The 'Valence' field contains the correct typed value. 'III' appears near the carbon atom in right side. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await selectValenceForAtom(page, 'III', 'Apply'); @@ -761,7 +761,7 @@ test.describe('Atom Properties', () => { The 'Radical' field contains the selected parameter. The radical symbol does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectRadical(page, 'Monoradical', 'Cancel'); @@ -777,7 +777,7 @@ test.describe('Atom Properties', () => { Diradical (singlet) - two dots; Diradical (triplet) - two caret signs (^^). */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await selectRadical(page, 'Monoradical', 'Apply'); @@ -823,7 +823,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1634 Description: All selected atoms is replaced with the typed atom symbols and Radicals. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await moveOnAtom(page, 'C', 0); await page.mouse.down(); @@ -881,7 +881,7 @@ test.describe('Atom Properties', () => { The 'Ring bond count' field contains the selected value. The Ring bond count value does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectRingBondCount(page, 'As drawn', 'Cancel'); @@ -896,7 +896,7 @@ test.describe('Atom Properties', () => { The 'Ring bond count' field contains the selected value. The selected Ring bond count - rb* - appears below the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await selectRingBondCount(page, 'As drawn', 'Apply'); @@ -946,7 +946,7 @@ test.describe('Atom Properties', () => { Description: Several atoms are selected. All selected atoms are replaced with the correct atom symbol with the correct atom properties. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await moveOnAtom(page, 'C', 0); await page.mouse.down(); @@ -972,7 +972,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1638 Description: Ring bond count atom property is displayed as specified from the menu item. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectRingBondCount(page, 'As drawn', 'Apply'); @@ -994,7 +994,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1639 Description: Ring bond count atom property is displayed as specified from the menu item. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectRingBondCount(page, 'As drawn', 'Apply'); @@ -1033,7 +1033,7 @@ test.describe('Atom Properties', () => { The 'H count' drop-down list contains values: 0, 1, 2, 3, 4. The value is selected. The 'H count' field contains the selected value. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectHCount(page, '0', 'Cancel'); @@ -1048,7 +1048,7 @@ test.describe('Atom Properties', () => { The 'H count' field contains the selected value. The selected hydrogen count value (H2) appears below/above the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectHCount(page, '2', 'Apply'); @@ -1061,7 +1061,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1640 Description: The newly selected hydrogen count is assigned to the carbon atom */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectHCount(page, '2', 'Apply'); @@ -1102,7 +1102,7 @@ test.describe('Atom Properties', () => { Hydrogen count atom property is displayed as specified from the menu item. Nothing happens. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await page.getByText('Query specific').click(); @@ -1126,7 +1126,7 @@ test.describe('Atom Properties', () => { The 'Substitution count' field contains the selected value. The substitution count does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectSubstitutionCount(page, '0', 'Cancel'); @@ -1141,7 +1141,7 @@ test.describe('Atom Properties', () => { The 'Substitution count' field contains the selected value. The selected substitution count s* appears near the carbon */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectSubstitutionCount(page, '2', 'Apply'); @@ -1154,7 +1154,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1642 Description: The newly selected Substitution count is assigned to the carbon atom */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectSubstitutionCount(page, '2', 'Apply'); @@ -1199,7 +1199,7 @@ test.describe('Atom Properties', () => { Number of nonhydrogen substituents is displayed as AtomSymbol(sN) where N depends on the number selected. Nothing is changed. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await page.getByText('Query specific').click(); @@ -1221,7 +1221,7 @@ test.describe('Atom Properties', () => { The 'Unsaturated' checkbox is present in the 'Query specific' field. The checkbox is not set by default. The unsaturated mark does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectUnsaturated(page, 'Cancel'); @@ -1236,7 +1236,7 @@ test.describe('Atom Properties', () => { The 'Unsaturated' checkbox is set. The 'u' mark appears below the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 3); await selectUnsaturated(page, 'Apply'); @@ -1264,7 +1264,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-8931 Description: Modal window opens without errors. All sections are displayed correctly. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 3); }); @@ -1290,7 +1290,7 @@ test.describe('Atom Properties', () => { "E" symbol appeared in "Atom" field next to "F". Selected atom now has "Fe" label. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await moveOnAtom(page, 'C', 3); await page.mouse.down(); @@ -1399,7 +1399,7 @@ test.describe('Atom Properties', () => { The 'Inversion' field contains the selected value. The stereo mark does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectReactionFlagsInversion(page, 'Inverts', 'Cancel'); @@ -1413,7 +1413,7 @@ test.describe('Atom Properties', () => { Description: The selected stereo mark appears near the carbon atom for Inverts - .Inv, ext. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 3); await selectReactionFlagsInversion(page, 'Inverts'); @@ -1429,7 +1429,7 @@ test.describe('Atom Properties', () => { Description: The selected stereo mark appears near the carbon atom for Retains - .Ret, ext. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 3); await selectReactionFlagsInversion(page, 'Retains'); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts index 53f55d9f0b..7d6471999b 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts @@ -20,7 +20,7 @@ test.describe('Open UTF-8 and save as SVG and PNG', () => { Test case: EPMLSOPKET-5252 Description: A file with UTF-8 encoding opens and, when saved in a SVG preview, contains all characters */ - await openFileAndAddToCanvas('Ket/utf-8-svg-png.ket', page); + await openFileAndAddToCanvas('KET/utf-8-svg-png.ket', page); await delay(DELAY_IN_SECONDS.THREE); await selectTopPanelButton(TopPanelButton.Save, page); await page.getByRole('button', { name: 'MDL Rxnfile V2000' }).click(); @@ -34,7 +34,7 @@ test.describe('Open UTF-8 and save as SVG and PNG', () => { Test case: EPMLSOPKET-5252 Description: A file with UTF-8 encoding opens and, when saved in a PNG preview, contains all characters */ - await openFileAndAddToCanvas('Ket/utf-8-svg-png.ket', page); + await openFileAndAddToCanvas('KET/utf-8-svg-png.ket', page); await delay(DELAY_IN_SECONDS.THREE); await selectTopPanelButton(TopPanelButton.Save, page); diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts index 3c2c3fc753..ef028628e1 100644 --- a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts +++ b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts @@ -229,7 +229,7 @@ test.describe('Functional Groups', () => { Test case: EPMLSOPKET-2894 Description: Contracted and Expanded functional groups are displayed on the canvas. */ - await openFileAndAddToCanvas('Ket/expanded-and-contracted-fg.ket', page); + await openFileAndAddToCanvas('KET/expanded-and-contracted-fg.ket', page); }); test('Paste from Clipboard with contracted and expanded functional groups', async ({ @@ -519,7 +519,7 @@ test.describe('Functional Groups', () => { */ const x = 540; const y = 350; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); await pressTab(page, 'Functional Groups'); await selectFunctionalGroups(FunctionalGroups.CN, page); @@ -612,7 +612,7 @@ test.describe('Functional Groups', () => { Test case: EPMLSOPKET-11849 Description: Structure on canvas not becomes 'undefined' when atom is hovered and Functional Group selected using hotkey. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); point = await getAtomByIndex(page, { label: 'C' }, 3); await page.mouse.move(point.x, point.y); await page.keyboard.press('Shift+t'); diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts index 248cf4de48..bd8c447c11 100644 --- a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts @@ -683,7 +683,7 @@ test.describe('Copy/Cut/Paste Actions', () => { // Error message when run under docker. But manual test is working. const x = 100; const y = 100; - await openFileAndAddToCanvas('Ket/stereo-test-structures.ket', page); + await openFileAndAddToCanvas('KET/stereo-test-structures.ket', page); await copyAndPaste(page); await page.mouse.click(x, y); }, @@ -698,7 +698,7 @@ test.describe('Copy/Cut/Paste Actions', () => { */ // Error message when run under docker. But manual test is working. const anyAtom = 5; - await openFileAndAddToCanvas('Ket/stereo-test-structures.ket', page); + await openFileAndAddToCanvas('KET/stereo-test-structures.ket', page); await cutAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); await selectAtomInToolbar(AtomButton.Nitrogen, page); @@ -750,7 +750,7 @@ test.describe('Copy/Cut/Paste Actions', () => { const x = 550; const y = 150; await openFileAndAddToCanvas( - 'Ket/structure-with-simple-objects-and-text.ket', + 'KET/structure-with-simple-objects-and-text.ket', page, ); await copyAndPaste(page); @@ -769,7 +769,7 @@ test.describe('Copy/Cut/Paste Actions', () => { // Can't attach atom of Nitrogen to structure. const anyAtom = 5; await openFileAndAddToCanvas( - 'Ket/structure-with-simple-objects-and-text.ket', + 'KET/structure-with-simple-objects-and-text.ket', page, ); await cutAndPaste(page); @@ -825,7 +825,7 @@ test.describe('Copy/Cut/Paste Actions', () => { */ const x = 500; const y = 100; - await openFileAndAddToCanvas('Ket/expanded-and-contracted-fg.ket', page); + await openFileAndAddToCanvas('KET/expanded-and-contracted-fg.ket', page); await copyAndPaste(page); await page.mouse.click(x, y); }); @@ -841,7 +841,7 @@ test.describe('Copy/Cut/Paste Actions', () => { */ // Can't attach atom of Nitrogen to the structure. const anyAtom = 5; - await openFileAndAddToCanvas('Ket/expanded-and-contracted-fg.ket', page); + await openFileAndAddToCanvas('KET/expanded-and-contracted-fg.ket', page); await cutAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); await selectAtomInToolbar(AtomButton.Nitrogen, page); diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts b/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts index 0fbc938ce9..174a3289ed 100644 --- a/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts @@ -407,7 +407,7 @@ test.describe('Undo/Redo Actions', () => { Undo: the Mapping tool is removed; Redo: the Mapping tool is restored. */ - await openFileAndAddToCanvas('Ket/reaction-chain.ket', page); + await openFileAndAddToCanvas('KET/reaction-chain.ket', page); await selectNestedTool(page, ReactionMappingTool.AUTOMAP); await pressButton(page, 'Apply'); await delay(DELAY_IN_SECONDS.THREE); diff --git a/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts index af7aae852e..f574017370 100644 --- a/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts @@ -25,7 +25,7 @@ test.describe('Outline for hovered structures', () => { test('Should draw selection outline correctly for hovered structures', async ({ page, }) => { - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await page.keyboard.press('Control+KeyA'); await page.keyboard.down('Control'); diff --git a/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts b/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts index caea41333d..41a5a8b952 100644 --- a/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts @@ -70,9 +70,21 @@ test.describe('Preview for abbreviated structures: functional groups', () => { await takeEditorScreenshot(page); }); + test('Should remove preview when context menu is shown after right click', async ({ + page, + }) => { + await selectFunctionalGroup(page); + const point = await getRightAtomByAttributes(page, { label: 'C' }); + await page.mouse.move(point.x, point.y); + // delay is required because preview is shown with delay + await delay(DELAY_IN_SECONDS.ONE); + await takeEditorScreenshot(page); + await page.mouse.click(point.x, point.y, { button: 'right' }); + await takeEditorScreenshot(page); + }); + test('Should show a preview for a benzene ring on bond', async ({ page }) => { const bondId = 2; - await selectRingButton(RingButton.Benzene, page); const bondPosition = await getBondByIndex( page, { type: BondType.SINGLE }, diff --git a/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-1fa6d--when-context-menu-is-shown-after-right-click-2-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-1fa6d--when-context-menu-is-shown-after-right-click-2-chromium-linux.png new file mode 100644 index 0000000000..90980e0f15 Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-1fa6d--when-context-menu-is-shown-after-right-click-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-94a81--when-context-menu-is-shown-after-right-click-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-94a81--when-context-menu-is-shown-after-right-click-1-chromium-linux.png new file mode 100644 index 0000000000..fdcbc287c4 Binary files /dev/null and b/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-94a81--when-context-menu-is-shown-after-right-click-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts index e44c720826..8776523da9 100644 --- a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts @@ -31,7 +31,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5872 Description: The menu has appeared and contains the list of Bonds. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); }); @@ -41,7 +41,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5876 Description: The menu has appeared and contains the list of Query Bonds. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Query bonds').click(); @@ -52,7 +52,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5873 Description: Single Bond changes on Double Bond. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Edit...').click(); @@ -66,7 +66,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5874 Description: Single Bond changes on Double Bond. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Double', { exact: true }).click(); @@ -77,7 +77,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5875 Description: Bond is deleted */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Delete', { exact: true }).click(); @@ -91,7 +91,7 @@ test.describe('Right-click menu', () => { Description: Bond is deleted */ let point: { x: number; y: number }; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectAtomInToolbar(AtomButton.Oxygen, page); point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); @@ -112,7 +112,7 @@ test.describe('Right-click menu', () => { - Enhanced stereochemistry (Should be grayed out if enhanced stereochemistry can not be added.) - Delete */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 1); await page.mouse.click(point.x, point.y, { button: 'right' }); }); @@ -139,7 +139,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5880 Description: Carbon atom changes to Oxygen. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 1); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Edit...').click(); @@ -158,7 +158,7 @@ test.describe('Right-click menu', () => { - Enhanced stereochemistry (Should be grayed out if enhanced stereochemistry can not be added.) - Delete */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 1); await page.mouse.click(point.x, point.y, { button: 'right' }); }); @@ -170,7 +170,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5882 Description: 'Enhanced stereochemistry' is NOT grayed out (User can add Enhanced stereochemistry) */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); }); @@ -183,7 +183,7 @@ test.describe('Right-click menu', () => { Description: Near the atom with the stereochemistry the '&1' and '&2' is displayed. And 'Mixed' flag appears. After add Ignore the chiral flag in settings - 'Mixed' flag dissapear. */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Enhanced stereochemistry...').click(); @@ -209,7 +209,7 @@ test.describe('Right-click menu', () => { Description: Near the atom with the stereochemistry the '&1' and 'or1' is displayed. And 'Mixed' flag appears. After add Ignore the chiral flag in settings - 'Mixed' flag dissapear. */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Enhanced stereochemistry...').click(); @@ -233,7 +233,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5883 Description: Atom is deleted by right-click menu */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Delete').click(); @@ -247,7 +247,7 @@ test.describe('Right-click menu', () => { Description: Only selected atoms and bonds are deleted. No error is thrown. */ let point: { x: number; y: number }; - await openFileAndAddToCanvas('Ket/chain-with-stereo-and-atoms.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo-and-atoms.ket', page); point = await getAtomByIndex(page, { label: 'N' }, 0); await page.keyboard.down('Shift'); await page.mouse.click(point.x, point.y); @@ -266,7 +266,7 @@ test.describe('Right-click menu', () => { */ const canvasClickX = 300; const canvasClickY = 300; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectAtomInToolbar(AtomButton.Oxygen, page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); @@ -280,7 +280,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-10082 Description: Opens right-click menu for atom */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectLeftPanelButton(LeftPanelButton.S_Group, page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); @@ -293,7 +293,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-10082 Description: Opens right-click menu for bond */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectLeftPanelButton(LeftPanelButton.S_Group, page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); @@ -306,7 +306,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-15495 Description: S-Group for Bond is attached. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Attach S-Group...', { exact: true }).click(); @@ -323,7 +323,7 @@ test.describe('Right-click menu', () => { Description: Three selected Carbon atoms changed to Nitrogen atoms. */ let point: { x: number; y: number }; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); point = await getAtomByIndex(page, { label: 'C' }, 1); await page.keyboard.down('Shift'); await page.mouse.click(point.x, point.y); @@ -347,7 +347,7 @@ test.describe('Right-click menu', () => { Description: Three selected Single Bonds changed to Double Bonds. */ let point: { x: number; y: number }; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); point = await getBondByIndex(page, { type: BondType.SINGLE }, 1); await page.keyboard.down('Shift'); await page.mouse.click(point.x, point.y); diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-atoms-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-atoms-1-chromium-linux.png index 8506e23767..746c169143 100644 Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-menu-for-atoms-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-1-chromium-linux.png index b1cc65e2f2..7f5891a4bc 100644 Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-2-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-2-chromium-linux.png index b7d3942f6f..e2f873f554 100644 Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-2-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-3-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-3-chromium-linux.png index e6fc1b1eaf..d14b6cf5b4 100644 Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-3-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-right-click-property-change-for-atoms-3-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-menu-Enhanced-ster-0f28b-f-atom-does-not-have-enhanced-stereochemistry-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-menu-Enhanced-ster-0f28b-f-atom-does-not-have-enhanced-stereochemistry-1-chromium-linux.png index 4bf284f94d..52ad438dbe 100644 Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-menu-Enhanced-ster-0f28b-f-atom-does-not-have-enhanced-stereochemistry-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-menu-Enhanced-ster-0f28b-f-atom-does-not-have-enhanced-stereochemistry-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-the-menu-Enhanced--751a5-out-if-the-atom-have-enhanced-stereochemistry-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-the-menu-Enhanced--751a5-out-if-the-atom-have-enhanced-stereochemistry-1-chromium-linux.png index 7ee7a200bd..02eee969b1 100644 Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-the-menu-Enhanced--751a5-out-if-the-atom-have-enhanced-stereochemistry-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Check-that-the-menu-Enhanced--751a5-out-if-the-atom-have-enhanced-stereochemistry-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-an-Atom-with-s-dae3c-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-an-Atom-with-s-dae3c-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png index fdaeebef79..2e97e94f64 100644 Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-an-Atom-with-s-dae3c-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Right-click-on-an-Atom-with-s-dae3c-roup-tool-not-opens-S-Group-Properties-window-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/test-data/Ket/alias-pseudoatom.ket b/ketcher-autotests/tests/test-data/KET/alias-pseudoatom.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/alias-pseudoatom.ket rename to ketcher-autotests/tests/test-data/KET/alias-pseudoatom.ket diff --git a/ketcher-autotests/tests/test-data/Ket/all-atoms-properties.ket b/ketcher-autotests/tests/test-data/KET/all-atoms-properties.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/all-atoms-properties.ket rename to ketcher-autotests/tests/test-data/KET/all-atoms-properties.ket diff --git a/ketcher-autotests/tests/test-data/Ket/all-type-bonds.ket b/ketcher-autotests/tests/test-data/KET/all-type-bonds.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/all-type-bonds.ket rename to ketcher-autotests/tests/test-data/KET/all-type-bonds.ket diff --git a/ketcher-autotests/tests/test-data/Ket/atoms-and-bonds.ket b/ketcher-autotests/tests/test-data/KET/atoms-and-bonds.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/atoms-and-bonds.ket rename to ketcher-autotests/tests/test-data/KET/atoms-and-bonds.ket diff --git a/ketcher-autotests/tests/test-data/Ket/benzene-arrow-benzene-reagent-hcl.ket b/ketcher-autotests/tests/test-data/KET/benzene-arrow-benzene-reagent-hcl.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/benzene-arrow-benzene-reagent-hcl.ket rename to ketcher-autotests/tests/test-data/KET/benzene-arrow-benzene-reagent-hcl.ket diff --git a/ketcher-autotests/tests/test-data/Ket/benzene-arrow-benzene-reagent-nh3.ket b/ketcher-autotests/tests/test-data/KET/benzene-arrow-benzene-reagent-nh3.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/benzene-arrow-benzene-reagent-nh3.ket rename to ketcher-autotests/tests/test-data/KET/benzene-arrow-benzene-reagent-nh3.ket diff --git a/ketcher-autotests/tests/test-data/Ket/benzene-ring-with-two-atoms.ket b/ketcher-autotests/tests/test-data/KET/benzene-ring-with-two-atoms.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/benzene-ring-with-two-atoms.ket rename to ketcher-autotests/tests/test-data/KET/benzene-ring-with-two-atoms.ket diff --git a/ketcher-autotests/tests/test-data/Ket/benzene-with-data-s-group.ket b/ketcher-autotests/tests/test-data/KET/benzene-with-data-s-group.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/benzene-with-data-s-group.ket rename to ketcher-autotests/tests/test-data/KET/benzene-with-data-s-group.ket diff --git a/ketcher-autotests/tests/test-data/Ket/calculated-values-chain.ket b/ketcher-autotests/tests/test-data/KET/calculated-values-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/calculated-values-chain.ket rename to ketcher-autotests/tests/test-data/KET/calculated-values-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain-with-attachment-points.ket b/ketcher-autotests/tests/test-data/KET/chain-with-attachment-points.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain-with-attachment-points.ket rename to ketcher-autotests/tests/test-data/KET/chain-with-attachment-points.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain-with-name-and-value.ket b/ketcher-autotests/tests/test-data/KET/chain-with-name-and-value.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain-with-name-and-value.ket rename to ketcher-autotests/tests/test-data/KET/chain-with-name-and-value.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain-with-stereo-and-atoms.ket b/ketcher-autotests/tests/test-data/KET/chain-with-stereo-and-atoms.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain-with-stereo-and-atoms.ket rename to ketcher-autotests/tests/test-data/KET/chain-with-stereo-and-atoms.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain-with-stereo.ket b/ketcher-autotests/tests/test-data/KET/chain-with-stereo.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain-with-stereo.ket rename to ketcher-autotests/tests/test-data/KET/chain-with-stereo.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain.ket b/ketcher-autotests/tests/test-data/KET/chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain.ket rename to ketcher-autotests/tests/test-data/KET/chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/default-reaction-arrow-tool-saving.ket b/ketcher-autotests/tests/test-data/KET/default-reaction-arrow-tool-saving.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/default-reaction-arrow-tool-saving.ket rename to ketcher-autotests/tests/test-data/KET/default-reaction-arrow-tool-saving.ket diff --git a/ketcher-autotests/tests/test-data/Ket/different-marks-stereostructure.ket b/ketcher-autotests/tests/test-data/KET/different-marks-stereostructure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/different-marks-stereostructure.ket rename to ketcher-autotests/tests/test-data/KET/different-marks-stereostructure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/expanded-and-contracted-fg.ket b/ketcher-autotests/tests/test-data/KET/expanded-and-contracted-fg.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/expanded-and-contracted-fg.ket rename to ketcher-autotests/tests/test-data/KET/expanded-and-contracted-fg.ket diff --git a/ketcher-autotests/tests/test-data/Ket/ket-2934-to-compare-expected.ket b/ketcher-autotests/tests/test-data/KET/ket-2934-to-compare-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/ket-2934-to-compare-expected.ket rename to ketcher-autotests/tests/test-data/KET/ket-2934-to-compare-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/ket-ket-2934-to-compare.ket b/ketcher-autotests/tests/test-data/KET/ket-ket-2934-to-compare.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/ket-ket-2934-to-compare.ket rename to ketcher-autotests/tests/test-data/KET/ket-ket-2934-to-compare.ket diff --git a/ketcher-autotests/tests/test-data/Ket/ket-reagent-above-arrow-expected.ket b/ketcher-autotests/tests/test-data/KET/ket-reagent-above-arrow-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/ket-reagent-above-arrow-expected.ket rename to ketcher-autotests/tests/test-data/KET/ket-reagent-above-arrow-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-and-or-structure.ket b/ketcher-autotests/tests/test-data/KET/mixed-and-or-structure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-and-or-structure.ket rename to ketcher-autotests/tests/test-data/KET/mixed-and-or-structure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-and-stereomarks-expected.ket b/ketcher-autotests/tests/test-data/KET/mixed-and-stereomarks-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-and-stereomarks-expected.ket rename to ketcher-autotests/tests/test-data/KET/mixed-and-stereomarks-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-and-stereomarks.ket b/ketcher-autotests/tests/test-data/KET/mixed-and-stereomarks.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-and-stereomarks.ket rename to ketcher-autotests/tests/test-data/KET/mixed-and-stereomarks.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-or-stereomarks-expected.ket b/ketcher-autotests/tests/test-data/KET/mixed-or-stereomarks-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-or-stereomarks-expected.ket rename to ketcher-autotests/tests/test-data/KET/mixed-or-stereomarks-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-or-stereomarks.ket b/ketcher-autotests/tests/test-data/KET/mixed-or-stereomarks.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-or-stereomarks.ket rename to ketcher-autotests/tests/test-data/KET/mixed-or-stereomarks.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-with-eight-stereocenters.ket b/ketcher-autotests/tests/test-data/KET/mixed-with-eight-stereocenters.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-with-eight-stereocenters.ket rename to ketcher-autotests/tests/test-data/KET/mixed-with-eight-stereocenters.ket diff --git a/ketcher-autotests/tests/test-data/Ket/multiple-group-data.ket b/ketcher-autotests/tests/test-data/KET/multiple-group-data.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/multiple-group-data.ket rename to ketcher-autotests/tests/test-data/KET/multiple-group-data.ket diff --git a/ketcher-autotests/tests/test-data/Ket/multiple-group.ket b/ketcher-autotests/tests/test-data/KET/multiple-group.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/multiple-group.ket rename to ketcher-autotests/tests/test-data/KET/multiple-group.ket diff --git a/ketcher-autotests/tests/test-data/Ket/non-default-reaction-arrow-tool-saving.ket b/ketcher-autotests/tests/test-data/KET/non-default-reaction-arrow-tool-saving.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/non-default-reaction-arrow-tool-saving.ket rename to ketcher-autotests/tests/test-data/KET/non-default-reaction-arrow-tool-saving.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reaction-arrow.ket b/ketcher-autotests/tests/test-data/KET/reaction-arrow.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reaction-arrow.ket rename to ketcher-autotests/tests/test-data/KET/reaction-arrow.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reaction-chain.ket b/ketcher-autotests/tests/test-data/KET/reaction-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reaction-chain.ket rename to ketcher-autotests/tests/test-data/KET/reaction-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reaction-with-arrow-and-plus.ket b/ketcher-autotests/tests/test-data/KET/reaction-with-arrow-and-plus.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reaction-with-arrow-and-plus.ket rename to ketcher-autotests/tests/test-data/KET/reaction-with-arrow-and-plus.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reagent-hcl-text-below-arrow.ket b/ketcher-autotests/tests/test-data/KET/reagent-hcl-text-below-arrow.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reagent-hcl-text-below-arrow.ket rename to ketcher-autotests/tests/test-data/KET/reagent-hcl-text-below-arrow.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reagent-nh3-text-above-arrow.ket b/ketcher-autotests/tests/test-data/KET/reagent-nh3-text-above-arrow.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reagent-nh3-text-above-arrow.ket rename to ketcher-autotests/tests/test-data/KET/reagent-nh3-text-above-arrow.ket diff --git a/ketcher-autotests/tests/test-data/Ket/resizing-reaction-arrow-saving.ket b/ketcher-autotests/tests/test-data/KET/resizing-reaction-arrow-saving.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/resizing-reaction-arrow-saving.ket rename to ketcher-autotests/tests/test-data/KET/resizing-reaction-arrow-saving.ket diff --git a/ketcher-autotests/tests/test-data/Ket/simple-chain.ket b/ketcher-autotests/tests/test-data/KET/simple-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/simple-chain.ket rename to ketcher-autotests/tests/test-data/KET/simple-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/sru-polymer-data.ket b/ketcher-autotests/tests/test-data/KET/sru-polymer-data.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/sru-polymer-data.ket rename to ketcher-autotests/tests/test-data/KET/sru-polymer-data.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-and-structure-expected.ket b/ketcher-autotests/tests/test-data/KET/stereo-and-structure-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-and-structure-expected.ket rename to ketcher-autotests/tests/test-data/KET/stereo-and-structure-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-and-structure.ket b/ketcher-autotests/tests/test-data/KET/stereo-and-structure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-and-structure.ket rename to ketcher-autotests/tests/test-data/KET/stereo-and-structure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-mixed-structure-expected.ket b/ketcher-autotests/tests/test-data/KET/stereo-mixed-structure-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-mixed-structure-expected.ket rename to ketcher-autotests/tests/test-data/KET/stereo-mixed-structure-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-mixed-structure.ket b/ketcher-autotests/tests/test-data/KET/stereo-mixed-structure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-mixed-structure.ket rename to ketcher-autotests/tests/test-data/KET/stereo-mixed-structure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-or-structure-expected.ket b/ketcher-autotests/tests/test-data/KET/stereo-or-structure-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-or-structure-expected.ket rename to ketcher-autotests/tests/test-data/KET/stereo-or-structure-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-or-structure.ket b/ketcher-autotests/tests/test-data/KET/stereo-or-structure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-or-structure.ket rename to ketcher-autotests/tests/test-data/KET/stereo-or-structure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-test-structures.ket b/ketcher-autotests/tests/test-data/KET/stereo-test-structures.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-test-structures.ket rename to ketcher-autotests/tests/test-data/KET/stereo-test-structures.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereolabels.ket b/ketcher-autotests/tests/test-data/KET/stereolabels.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereolabels.ket rename to ketcher-autotests/tests/test-data/KET/stereolabels.ket diff --git a/ketcher-autotests/tests/test-data/Ket/structure-with-simple-objects-and-text.ket b/ketcher-autotests/tests/test-data/KET/structure-with-simple-objects-and-text.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/structure-with-simple-objects-and-text.ket rename to ketcher-autotests/tests/test-data/KET/structure-with-simple-objects-and-text.ket diff --git a/ketcher-autotests/tests/test-data/Ket/structure-with-stereo-bonds-expected.ket b/ketcher-autotests/tests/test-data/KET/structure-with-stereo-bonds-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/structure-with-stereo-bonds-expected.ket rename to ketcher-autotests/tests/test-data/KET/structure-with-stereo-bonds-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/structure-with-stereo-flags.ket b/ketcher-autotests/tests/test-data/KET/structure-with-stereo-flags.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/structure-with-stereo-flags.ket rename to ketcher-autotests/tests/test-data/KET/structure-with-stereo-flags.ket diff --git a/ketcher-autotests/tests/test-data/Ket/superatom-all-chain.ket b/ketcher-autotests/tests/test-data/KET/superatom-all-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/superatom-all-chain.ket rename to ketcher-autotests/tests/test-data/KET/superatom-all-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/superatom-one-atom-on-chain.ket b/ketcher-autotests/tests/test-data/KET/superatom-one-atom-on-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/superatom-one-atom-on-chain.ket rename to ketcher-autotests/tests/test-data/KET/superatom-one-atom-on-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/two-arrows-and-plus.ket b/ketcher-autotests/tests/test-data/KET/two-arrows-and-plus.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/two-arrows-and-plus.ket rename to ketcher-autotests/tests/test-data/KET/two-arrows-and-plus.ket diff --git a/ketcher-autotests/tests/test-data/Ket/two-atoms.ket b/ketcher-autotests/tests/test-data/KET/two-atoms.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/two-atoms.ket rename to ketcher-autotests/tests/test-data/KET/two-atoms.ket diff --git a/ketcher-autotests/tests/test-data/Ket/two-benzene-with-atoms.ket b/ketcher-autotests/tests/test-data/KET/two-benzene-with-atoms.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/two-benzene-with-atoms.ket rename to ketcher-autotests/tests/test-data/KET/two-benzene-with-atoms.ket diff --git a/ketcher-autotests/tests/test-data/Ket/utf-8-svg-png.ket b/ketcher-autotests/tests/test-data/KET/utf-8-svg-png.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/utf-8-svg-png.ket rename to ketcher-autotests/tests/test-data/KET/utf-8-svg-png.ket diff --git a/ketcher-autotests/tests/utils/files/readFile.ts b/ketcher-autotests/tests/utils/files/readFile.ts index deadd175ae..434dd5b893 100644 --- a/ketcher-autotests/tests/utils/files/readFile.ts +++ b/ketcher-autotests/tests/utils/files/readFile.ts @@ -133,7 +133,7 @@ export async function saveToFile(filename: string, data: string) { } /* Example of usage: -await openFileAndAddToCanvas('Ket/benzene-arrow-benzene-reagent-hcl.ket', page); +await openFileAndAddToCanvas('KET/benzene-arrow-benzene-reagent-hcl.ket', page); const rxnFile = await getRxn(page, 'v3000'); await saveToFile('benzene-arrow-benzene-reagent-hcl.rxn', rxnFile); */ export async function pasteFromClipboard(page: Page, fillValue: string) { diff --git a/package-lock.json b/package-lock.json index 6d084ad9de..0943d86534 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25079,7 +25079,7 @@ } }, "packages/ketcher-core": { - "version": "2.14.0-rc.3", + "version": "2.15.0-rc.1", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -26099,7 +26099,7 @@ "dev": true }, "packages/ketcher-react": { - "version": "2.14.0-rc.3", + "version": "2.15.0-rc.1", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", @@ -26245,7 +26245,7 @@ } }, "packages/ketcher-standalone": { - "version": "2.14.0-rc.3", + "version": "2.15.0-rc.1", "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.17.9", diff --git a/packages/ketcher-core/package.json b/packages/ketcher-core/package.json index 5722f2cbea..3addad5eca 100644 --- a/packages/ketcher-core/package.json +++ b/packages/ketcher-core/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-core", - "version": "2.14.0-rc.3", + "version": "2.15.0-rc.1", "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 b67e27e01c..ae1a6fd43f 100644 --- a/packages/ketcher-react/package.json +++ b/packages/ketcher-react/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-react", - "version": "2.14.0-rc.3", + "version": "2.15.0-rc.1", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher", diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.tsx b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.tsx index 676659c870..1bbadd38cf 100644 --- a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.tsx +++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.tsx @@ -28,6 +28,7 @@ import { getIsItemInSelection, getMenuPropsForSelection, } from './ContextMenuTrigger.utils'; +import TemplateTool from 'src/script/editor/tool/template'; const ContextMenuTrigger: React.FC = ({ children }) => { const { getKetcherInstance } = useAppContext(); @@ -72,6 +73,12 @@ const ContextMenuTrigger: React.FC = ({ children }) => { event.preventDefault(); const editor = getKetcherInstance().editor as Editor; + + const currentTool = editor.tool(); + if (currentTool instanceof TemplateTool) { + currentTool.hidePreview(); + } + const closestItem = editor.findItem(event, null); const selection = editor.selection(); const { selectedFunctionalGroups, selectedSGroupsIds } = diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts index 367660d8ca..4ad8dcb5c4 100644 --- a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts +++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/ContextMenuTrigger.utils.ts @@ -96,9 +96,12 @@ export function getMenuPropsForClosestItem( } case 'rgroupAttachmentPoints': { + const atomId = struct.rgroupAttachmentPoints.get(closestItem.id)?.atomId; + return { id: CONTEXT_MENU_ID.FOR_R_GROUP_ATTACHMENT_POINT, rgroupAttachmentPoints: [closestItem.id], + atomIds: typeof atomId === 'number' ? [atomId] : undefined, }; } diff --git a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/AtomMenuItems.tsx b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/AtomMenuItems.tsx index 1e5da52a0b..2a9cd51adb 100644 --- a/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/AtomMenuItems.tsx +++ b/packages/ketcher-react/src/script/ui/views/components/ContextMenu/menuItems/AtomMenuItems.tsx @@ -98,7 +98,7 @@ const AtomMenuItems: FC = (props) => { hidden={rgroupAttachmentPointHidden} onClick={handleEditRGroupAttachmentPoint} > - Edit R-Group attachment point... + Edit attachment point... = (props) => { const handleRemove = useRGroupAttachmentPointRemove(); + const [ + handleEditRGroupAttachmentPoint, + rgroupAttachmentPointDisabled, + rgroupAttachmentPointHidden, + ] = useRGroupAttachmentPointEdit(); return ( <> + Remove diff --git a/packages/ketcher-standalone/package.json b/packages/ketcher-standalone/package.json index dcb0937d09..805c6ccc7a 100644 --- a/packages/ketcher-standalone/package.json +++ b/packages/ketcher-standalone/package.json @@ -1,6 +1,6 @@ { "name": "ketcher-standalone", - "version": "2.14.0-rc.3", + "version": "2.15.0-rc.1", "description": "Web-based molecule sketcher", "license": "Apache-2.0", "homepage": "http://lifescience.opensource.epam.com/ketcher",