diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts index e91ecc8138..6da6879815 100644 --- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts +++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts @@ -1,8 +1,6 @@ import { test } from '@playwright/test'; import { clickInTheMiddleOfTheScreen, - TopPanelButton, - selectTopPanelButton, openFileAndAddToCanvas, takeEditorScreenshot, pasteFromClipboardAndAddToCanvas, @@ -27,21 +25,19 @@ test.describe('CDX files', () => { await openFileAndAddToCanvas('cdx-expanded-contracted.cdx', page); }); - test.fixme('opening cdx files with R-group', async ({ page }) => { + test('opening cdx files with R-group', async ({ page }) => { /* Test case: EPMLSOPKET-6973 Description: Open CDX files with R-group */ - await openFileAndAddToCanvas('cdx_file.cdx', page); + await openFileAndAddToCanvas('r_group_cdx.cdx', page); }); - test.fixme('opening cdx files from clipboard', async ({ page }) => { + test('opening cdx files from clipboard', async ({ page }) => { /* Test case: EPMLSOPKET-6972 Description: Open structure created in ChemDraw from clickboard */ - await selectTopPanelButton(TopPanelButton.Open, page); - await page.getByText('Paste from clipboard').click(); await pasteFromClipboardAndAddToCanvas( page, // eslint-disable-next-line max-len diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts-snapshots/CDX-files-opening-cdx-files-from-clipboard-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts-snapshots/CDX-files-opening-cdx-files-from-clipboard-1-chromium-linux.png new file mode 100644 index 0000000000..d7ad9c6409 Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts-snapshots/CDX-files-opening-cdx-files-from-clipboard-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts-snapshots/CDX-files-opening-cdx-files-with-R-group-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts-snapshots/CDX-files-opening-cdx-files-with-R-group-1-chromium-linux.png new file mode 100644 index 0000000000..9a99bc741f Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts-snapshots/CDX-files-opening-cdx-files-with-R-group-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts index 44d8eb9727..d3d68c9358 100644 --- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts +++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts @@ -100,27 +100,26 @@ test.describe('CML files', () => { expect(cmlFile).toEqual(cmlFileExpected); }); - test.fixme( - 'Open and Save file - CML - CML for R-group and other features', - async ({ page }) => { - /** - * Test case: EPMLSOPKET-1948 - * Description: Saved cml file with structure is compering with paste R-group from a mol file - */ - - await openFileAddToCanvasTakeScreenshot(page, 'cml-1948-R-group.mol'); - // check that structure opened from file is displayed correctly - - const expectedFile = await getCml(page); - await saveToFile('cml-1948-r-group-expected.cml', expectedFile); - const { file: cmlFile, fileExpected: cmlFileExpected } = - await receiveFileComparisonData({ - page, - expectedFileName: 'tests/test-data/cml-1948-r-group-expected.cml', - }); - // comparing cml file with golden cml file - - expect(cmlFile).toEqual(cmlFileExpected); - }, - ); + test('Open and Save file - CML - CML for R-group and other features', async ({ + page, + }) => { + /** + * Test case: EPMLSOPKET-1948 + * Description: Saved cml file with structure is compering with paste R-group from a mol file + */ + + await openFileAddToCanvasTakeScreenshot(page, 'cml-1948-R-group.mol'); + // check that structure opened from file is displayed correctly + + const expectedFile = await getCml(page); + await saveToFile('cml-1948-r-group-expected.cml', expectedFile); + const { file: cmlFile, fileExpected: cmlFileExpected } = + await receiveFileComparisonData({ + page, + expectedFileName: 'tests/test-data/cml-1948-r-group-expected.cml', + }); + // comparing cml file with golden cml file + + expect(cmlFile).toEqual(cmlFileExpected); + }); }); diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-R-group-and-other-features-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-R-group-and-other-features-1-chromium-linux.png index d287534a1e..0fcc91d364 100644 Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-R-group-and-other-features-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts-snapshots/CML-files-Open-and-Save-file---CML---CML-for-R-group-and-other-features-1-chromium-linux.png differ 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 b4f0e679e4..3626d31ac7 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 @@ -92,7 +92,7 @@ test.describe('SMILES files', () => { ); }); - test.skip('SmileString from mol file that contains abbreviation', async ({ + test('SmileString from mol file that contains abbreviation', async ({ page, }) => { /* @@ -106,9 +106,7 @@ test.describe('SMILES files', () => { await page.getByText('Warnings').click(); }); - test.skip('SmileString from mol file that contains Sgroup', async ({ - page, - }) => { + test('SmileString from mol file that contains Sgroup', async ({ page }) => { /* Test case: EPMLSOPKET-1914 Description: In Daylight SMILES the structure will be saved without S-groups @@ -124,7 +122,7 @@ test.describe('SMILES files', () => { await clearCanvasAndPasteSmiles( page, - 'CCCCCCCCCCCCC.CCCCCCC.CCCCCCC.CCCCCCC.CCCCCCC |Sg:gen:16,17,15:,Sg:n:23,24,22:n:ht|', + 'CCCCCCCCCCCCC.CCCCCCC.CCCCCCC.CCCCCCC.CCCCCCC |Sg:gen:16,17,15:,Sg:n:23,24,22:n:ht,SgD:38,37,36:fgfh:dsfsd::: :|', ); }); @@ -149,27 +147,29 @@ test.describe('SMILES files', () => { }); // flaky - test.fixme( - 'SmileString from mol file that contains attached data', - async ({ page }) => { - /* + test('SmileString from mol file that contains attached data', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1916 Description: Warning tab: Structure contains query properties of atoms and bonds that are not supported in the SMILES. Query properties will not be reflected in the saved file */ - await openFileAndAddToCanvas('Molfiles-V2000/attached-data.mol', page); - await getAndCompareSmiles( - page, - 'tests/test-data/JSON/attached-data-expected.json', - ); + await openFileAndAddToCanvas('Molfiles-V2000/attached-data.mol', page); + await getAndCompareSmiles( + page, + 'tests/test-data/JSON/attached-data-expected.json', + ); - await getPreviewForSmiles(page, 'MDL Molfile V2000', 'Daylight SMILES'); - await page.getByText('Warnings').click(); - await takeEditorScreenshot(page); + await getPreviewForSmiles(page, 'MDL Molfile V2000', 'Daylight SMILES'); + await page.getByText('Warnings').click(); + await takeEditorScreenshot(page); - await clearCanvasAndPasteSmiles(page, 'CCCC[C@@H](C)[C@@H](C)CC'); - }, - ); + await clearCanvasAndPasteSmiles( + page, + 'CCCC[C@@H](C)[C@@H](C)CC |SgD:4,5:Purity:Purity = 96%::: :|', + ); + }); test('SmileString from V2000 mol file contains abs stereochemistry', async ({ page, @@ -197,33 +197,32 @@ test.describe('SMILES files', () => { }); // flaky - test.fixme( - 'SmileString from mol file that contains combination of different features', - async ({ page }) => { - /* + test('SmileString from mol file that contains combination of different features', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1920 Description: SmileString is correctly generated from structure and vise versa structure is correctly generated from SmileString. Structure appears without attached data and brackets, query features, Rgroup labels are rendered as R# symbols. */ - await openFileAndAddToCanvas('different-features.mol', page); - await getAndCompareSmiles( - page, - 'tests/test-data/smiles-different-features-expected.json', - ); - - await getPreviewForSmiles(page, 'MDL Molfile V2000', 'Daylight SMILES'); - await takeEditorScreenshot(page); - - await clearCanvasAndPasteSmiles( - page, - // eslint-disable-next-line max-len - 'S=CC(F)CCCCC[C@@](CCO)/C=C/[C@@](N)CCC[C]C([13C]CC([C+2]CC(CC%91)CC(C)CCC)CCC)CC%92.[*:2]%92.[*:1]%91 |$;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;_R2;_R1$,rb:32:*,u:3|', - ); - await delay(DELAY_IN_SECONDS.THREE); - }, - ); + await openFileAndAddToCanvas('different-features.mol', page); + await getAndCompareSmiles( + page, + 'tests/test-data/smiles-different-features-expected.json', + ); + + await getPreviewForSmiles(page, 'MDL Molfile V2000', 'Daylight SMILES'); + await takeEditorScreenshot(page); + + await clearCanvasAndPasteSmiles( + page, + // eslint-disable-next-line max-len + 'S=CC(F)CCCCC[C@@](CCO)/C=C/[C@@](N)CCC[C]C([13C]CC([C+2]CC(CC%91)CC(C)CCC)CCC)CC%92.[*:2]%92.[*:1]%91 |$;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;_R2;_R1$,rb:32:*,u:3|', + ); + await delay(DELAY_IN_SECONDS.THREE); + }); test('SmileString from file that contains Cis/Trans configuration', async ({ page, @@ -248,7 +247,7 @@ test.describe('SMILES files', () => { ); }); - test.skip('SmileString from file that contains alias and pseudoatom', async ({ + test('SmileString from file that contains alias and pseudoatom', async ({ page, }) => { /* @@ -265,7 +264,7 @@ test.describe('SMILES files', () => { await getPreviewForSmiles(page, 'MDL Molfile V2000', 'Daylight SMILES'); await takeEditorScreenshot(page); - await clearCanvasAndPasteSmiles(page, ''); + await clearCanvasAndPasteSmiles(page, 'CCCC*CC |$;;alias123;;GH*;;$|'); }); test('SmileString from reaction consists of two or more reaction arrows and structures', async ({ diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-alias-and-pseudoatom-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-alias-and-pseudoatom-1-chromium-linux.png new file mode 100644 index 0000000000..5533769dd8 Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-alias-and-pseudoatom-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-alias-and-pseudoatom-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-alias-and-pseudoatom-2-chromium-linux.png new file mode 100644 index 0000000000..59913559a6 Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-file-that-contains-alias-and-pseudoatom-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-Sgroup-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-Sgroup-1-chromium-linux.png new file mode 100644 index 0000000000..5daf23bd1d Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-Sgroup-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-Sgroup-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-Sgroup-2-chromium-linux.png new file mode 100644 index 0000000000..aa3847ac0b Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-Sgroup-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-attached-data-2-chromium-linux.png b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-attached-data-2-chromium-linux.png index fc6c99678c..ebbff3d911 100644 Binary files a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-attached-data-2-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts-snapshots/SMILES-files-SmileString-from-mol-file-that-contains-attached-data-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts index b37d278787..97913408d0 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts @@ -66,29 +66,28 @@ test.describe('Aromatize/Dearomatize Tool', () => { await selectTopPanelButton(TopPanelButton.Dearomatize, page); }); - test.fixme( - 'Aromatic structures - interchanged Single and Double bonds', - async ({ page }) => { - /* + test('Aromatic structures - interchanged Single and Double bonds', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1870 Description: The aromatic structures appear with circle inside the cycles. Aromatize function affects all canvas. The structures appears in a Kekule form: with interchanged Single and Double bonds. Dearomatize function affects all canvas. */ - await openFileAndAddToCanvas( - 'Molfiles-V2000/aromatic-structures.mol', - page, - ); - await waitForSpinnerFinishedWork(page, async () => { - await selectTopPanelButton(TopPanelButton.Aromatize, page); - }); - await takeEditorScreenshot(page); - await waitForSpinnerFinishedWork(page, async () => { - await selectTopPanelButton(TopPanelButton.Dearomatize, page); - }); - }, - ); + await openFileAndAddToCanvas( + 'Molfiles-V2000/aromatic-structures.mol', + page, + ); + await waitForSpinnerFinishedWork(page, async () => { + await selectTopPanelButton(TopPanelButton.Aromatize, page); + }); + await takeEditorScreenshot(page); + await waitForSpinnerFinishedWork(page, async () => { + await selectTopPanelButton(TopPanelButton.Dearomatize, page); + }); + }); test('Cycles with Aromatic Bonds', async ({ page }) => { /* @@ -104,26 +103,25 @@ test.describe('Aromatize/Dearomatize Tool', () => { await selectTopPanelButton(TopPanelButton.Dearomatize, page); }); - test.fixme( - '(Undo/Redo) Manipulations with cyclic structures with a circle inside the cycle', - async ({ page }) => { - /* + test('(Undo/Redo) Manipulations with cyclic structures with a circle inside the cycle', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1872 Description: Only six-cycle structures appear in a Kekule form: with interchanged Single and Double bonds. All other structures are rendered with a circle inside the cycles. The actions are Undone/Redone. */ - await openFileAndAddToCanvas('cycles-with-aromatic-bonds.mol', page); - await waitForSpinnerFinishedWork(page, async () => { - await selectTopPanelButton(TopPanelButton.Aromatize, page); - }); - await waitForSpinnerFinishedWork(page, async () => { - await selectTopPanelButton(TopPanelButton.Dearomatize, page); - }); - await selectTopPanelButton(TopPanelButton.Undo, page); - await takeEditorScreenshot(page); - await selectTopPanelButton(TopPanelButton.Redo, page); - }, - ); + await openFileAndAddToCanvas('cycles-with-aromatic-bonds.mol', page); + await waitForSpinnerFinishedWork(page, async () => { + await selectTopPanelButton(TopPanelButton.Aromatize, page); + }); + await waitForSpinnerFinishedWork(page, async () => { + await selectTopPanelButton(TopPanelButton.Dearomatize, page); + }); + await selectTopPanelButton(TopPanelButton.Undo, page); + await takeEditorScreenshot(page); + await selectTopPanelButton(TopPanelButton.Redo, page); + }); test('(Copy/Paste) Manipulations with cyclic structures with a circle inside the cycle', async ({ page, diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png index 33695cdfae..240f302b2a 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png index a837f0f97c..494f463d68 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Aromatic-structures---interchanged-Single-and-Double-bonds-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-0c986-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-0c986-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png index f76e89cf7d..18eedeac01 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-0c986-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-0c986-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-72b71-lic-structures-with-a-circle-inside-the-cycle-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-72b71-lic-structures-with-a-circle-inside-the-cycle-2-chromium-linux.png index 74fb1d60d9..b18444e97a 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-72b71-lic-structures-with-a-circle-inside-the-cycle-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Undo-Redo-Manipul-72b71-lic-structures-with-a-circle-inside-the-cycle-2-chromium-linux.png differ 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 ebc523723d..bc0e00c52f 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 @@ -184,7 +184,7 @@ test.describe('Calculated Values Tools', () => { Description: Calculation of exact mass for the reaction should be correct: '[78.047] > [155.957]'. */ - await openFileAndAddToCanvas('benzene-bromination.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/benzene-bromination.rxn', page); await selectTopPanelButton(TopPanelButton.Calculated, page); }); diff --git a/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts index ba8490a383..b1d7529004 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts @@ -27,7 +27,7 @@ test.describe('Indigo Tools - Layout', () => { test('Center molecule after layout', async ({ page }) => { // Related Github issue: https://github.com/epam/ketcher/issues/2078 - const anyStructure = 'benzene-rings.mol'; + const anyStructure = 'Molfiles-V2000/benzene-rings.mol'; await openFileWithShift(anyStructure, page); await selectTopPanelButton(TopPanelButton.Layout, page); await takeEditorScreenshot(page); diff --git a/ketcher-autotests/tests/Indigo-Tools/Reaction Auto-mapping tool/reaction-am-tool-veryfing-button.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Reaction Auto-mapping tool/reaction-am-tool-veryfing-button.spec.ts index 8b9259be6b..86b64ba4d0 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Reaction Auto-mapping tool/reaction-am-tool-veryfing-button.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Reaction Auto-mapping tool/reaction-am-tool-veryfing-button.spec.ts @@ -45,7 +45,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { const point2 = { x: 200, y: 0 }; await selectNestedTool(page, ReactionMappingTool.AUTOMAP); await takeEditorScreenshot(page); - await openFileAndAddToCanvas('four-structures.mol', page); + await openFileAndAddToCanvas('Molfiles-V2000/four-structures.mol', page); await selectNestedTool(page, ReactionMappingTool.AUTOMAP); await takeEditorScreenshot(page); await selectLeftPanelButton(LeftPanelButton.ReactionPlusTool, page); @@ -79,7 +79,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { test(`${mode} mode`, async ({ page }) => { const point1 = { x: -250, y: 8 }; const point2 = { x: -250, y: 55 }; - await openFileAndAddToCanvas('Rxn-V3000/reaction-3.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/reaction-3.rxn', page); await applyAutoMapMode(page, mode); await selectTopPanelButton(TopPanelButton.Undo, page); await takeEditorScreenshot(page); @@ -110,7 +110,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { * Test cases: EPMLSOPKET-1817 * Description: After the manual mapping with incorrect ordering */ - await openFileAndAddToCanvas('alter_mapping.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/alter-mapping.rxn', page); await mapTwoAtoms( page, { label: 'S', number: 0 }, @@ -128,7 +128,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { * Test cases: EPMLSOPKET-1818 * Description: After the manual mapping with incorrect pairs */ - await openFileAndAddToCanvas('alter_mapping.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/alter-mapping.rxn', page); await mapTwoAtoms( page, { label: 'S', number: 0 }, @@ -146,7 +146,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { * Test cases: EPMLSOPKET-1819 * Description: Compare the behavior */ - await openFileAndAddToCanvas('for_MappingTools_10.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/for-mappingTools-10.rxn', page); }); }); @@ -155,7 +155,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { * Test cases: EPMLSOPKET-1821 * Description: Clear mode */ - await openFileAndAddToCanvas('Rxn-V3000/reaction-3.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/reaction-3.rxn', page); await applyAutoMapMode(page, 'Alter'); await applyAutoMapMode(page, 'Clear'); await mapTwoAtoms( @@ -173,7 +173,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { * Test cases: EPMLSOPKET-1821 * Description: Half reaction on canvas */ - await openFileAndAddToCanvas('reaction_half.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/reaction-half.rxn', page); await applyAutoMapMode(page, 'Discard', false); }); @@ -182,11 +182,11 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { * Test cases: EPMLSOPKET-1832 * Description: Verifying of the correct automapping */ - await openFileAndAddToCanvas('allenes.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/allenes.rxn', page); await applyAutoMapMode(page, 'Discard'); - await openFileAndAddToCanvas('mapping_4_benzene.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/mapping-4-benzene.rxn', page); await applyAutoMapMode(page, 'Keep'); - await openFileAndAddToCanvas('allenes.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/allenes.rxn', page); await applyAutoMapMode(page, 'Alter', false); }); }); diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts deleted file mode 100644 index 8e701aeb80..0000000000 --- a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts +++ /dev/null @@ -1,249 +0,0 @@ -import { Page, test } from '@playwright/test'; -import { - delay, - takeEditorScreenshot, - clickInTheMiddleOfTheScreen, - getCoordinatesTopAtomOfBenzeneRing, - selectRingButton, - RingButton, - selectNestedTool, - RgroupTool, - DELAY_IN_SECONDS, - AttachmentPoint, - openFileAndAddToCanvas, - SelectTool, - pressButton, - clickOnAtom, - TopPanelButton, - selectTopPanelButton, - LeftPanelButton, - selectLeftPanelButton, - waitForIndigoToLoad, -} from '@utils'; - -async function openRGroupModalForTopAtom(page: Page) { - await selectRingButton(RingButton.Benzene, page); - await clickInTheMiddleOfTheScreen(page); - - await selectNestedTool(page, RgroupTool.R_GROUP_FRAGMENT); - const { x, y } = await getCoordinatesTopAtomOfBenzeneRing(page); - await page.mouse.click(x, y); - - return { x, y }; -} - -const rGroupFromFile = 'R8'; -const atomIndex = 3; -async function selectRGroups(page: Page, rGroups: string[]) { - await selectNestedTool(page, RgroupTool.R_GROUP_FRAGMENT); - await page.getByText(rGroupFromFile).click(); - for (const rgroup of rGroups) { - await pressButton(page, rgroup); - } - await pressButton(page, 'Apply'); -} - -async function selectRGroup(page: Page, rgroup: string) { - await page.locator('button', { hasText: rgroup }).click(); -} - -async function clickModalButton(page: Page, button: 'Apply' | 'Cancel') { - await page.locator(`input[type="button"][value="${button}"]`).click(); -} - -test.describe('Open Ketcher', () => { - test.beforeEach(async ({ page }) => { - await page.goto(''); - await waitForIndigoToLoad(page); - }); - - test.afterEach(async ({ page }) => { - await takeEditorScreenshot(page); - }); - - test('R-Fragment-Group dialog opening', async ({ page }) => { - /* Test case: EPMLSOPKET-1582 and EPMLSOPKET-1610 - Description: R-Fragment-Group dialog opening - */ - await openRGroupModalForTopAtom(page); - await selectRGroup(page, 'R5'); - }); - - test('R-Fragment-Group UI Verification', async ({ page }) => { - /* Test case: EPMLSOPKET-1583 - Description: R-Fragment-Group UI Verification - */ - await openRGroupModalForTopAtom(page); - }); - - test('R-Fragment-Group dialog cancelling', async ({ page }) => { - /* Test case: EPMLSOPKET-1584 - Description: R-Fragment-Group dialog cancelling - */ - await openRGroupModalForTopAtom(page); - await selectRGroup(page, 'R5'); - await clickModalButton(page, 'Cancel'); - }); - - test('Create Single R-Fragment-Group member', async ({ page }) => { - /* Test case: EPMLSOPKET-1585 - Description: Create Single R-Fragment-Group member - */ - await openRGroupModalForTopAtom(page); - await page.getByText('R5').click(); - await clickModalButton(page, 'Apply'); - }); - - test('Change R-Group definition for single R-Group member', async ({ - page, - }) => { - /* Test case: EPMLSOPKET-1587 - Description: Change R-Group definition for single R-Group member - */ - const { x, y } = await openRGroupModalForTopAtom(page); - await page.getByText('R5').click(); - await clickModalButton(page, 'Apply'); - - await page.mouse.click(x, y); - await selectRGroup(page, rGroupFromFile); - await clickModalButton(page, 'Apply'); - }); - - test('Add attachment point to the R-Group member', async ({ page }) => { - /* Test case: EPMLSOPKET-1598 - Description: Change R-Group definition for single R-Group member - */ - const { x, y } = await openRGroupModalForTopAtom(page); - await page.getByText('R5').click(); - await clickModalButton(page, 'Apply'); - - await delay(DELAY_IN_SECONDS.THREE); - await page.keyboard.press('Control+r'); - await page.mouse.click(x, y); - await page.getByLabel(AttachmentPoint.PRIMARY).check(); - await clickModalButton(page, 'Apply'); - }); - - test('Brackets rendering for whole r-group structure', async ({ page }) => { - await openFileAndAddToCanvas('KET/simple-chain.ket', page); - await selectNestedTool(page, RgroupTool.R_GROUP_FRAGMENT); - await clickOnAtom(page, 'C', atomIndex); - await page.getByText(rGroupFromFile).click(); - await clickModalButton(page, 'Apply'); - }); - - test('Brackets rendering for whole r-group structure even with attachment points', async ({ - page, - }) => { - await openFileAndAddToCanvas('KET/simple-chain.ket', page); - await selectNestedTool(page, RgroupTool.ATTACHMENT_POINTS); - await clickOnAtom(page, 'C', atomIndex); - await page.getByLabel(AttachmentPoint.PRIMARY).check(); - await clickModalButton(page, 'Apply'); - await selectNestedTool( - page, - RgroupTool.R_GROUP_FRAGMENT, - RgroupTool.ATTACHMENT_POINTS, - ); - await clickOnAtom(page, 'C', atomIndex); - await page.getByText(rGroupFromFile).click(); - await clickModalButton(page, 'Apply'); - }); - - test('Remove R-Group member from R-Group', async ({ page }) => { - /* Test case: EPMLSOPKET-1589 - Description: Remove R-Group member from R-Group. File used for test - R-fragment-structure.mol - */ - await openFileAndAddToCanvas('R-fragment-structure.mol', page); - await clickInTheMiddleOfTheScreen(page); - await selectRGroups(page, ['R5']); - }); - - test('Change R-Group definition for multiple R-Group members', async ({ - page, - }) => { - /* Test case: EPMLSOPKET-1588 - Description: Change R-Group definition for multiple R-Group members. File used for test - R-fragment-structure.mol - */ - await openFileAndAddToCanvas('R-fragment-structure.mol', page); - await clickInTheMiddleOfTheScreen(page); - await selectRGroups(page, ['R7']); - }); - - test('Create several R-Group members', async ({ page }) => { - /* Test case: EPMLSOPKET-1586 - Description: Create several R-Group members - */ - await openFileAndAddToCanvas('Molfiles-V2000/three-structures.mol', page); - - await selectRGroups(page, ['R7']); - - await page.getByText('R16').click(); - await selectRGroup(page, 'R8'); - await clickModalButton(page, 'Apply'); - - await page.getByText('R14').click(); - await selectRGroup(page, 'R15'); - await clickModalButton(page, 'Apply'); - }); - - test('Define a structure with attachment points as R-Group member', async ({ - page, - }) => { - /* Test case: EPMLSOPKET-1599 - Description: Define a structure with attachment points as R-Group member - */ - await selectRingButton(RingButton.Benzene, page); - await clickInTheMiddleOfTheScreen(page); - - await delay(DELAY_IN_SECONDS.THREE); - await selectNestedTool(page, RgroupTool.ATTACHMENT_POINTS); - const { x, y } = await getCoordinatesTopAtomOfBenzeneRing(page); - await page.mouse.click(x, y); - await page.getByLabel(AttachmentPoint.PRIMARY).check(); - await page.getByLabel(AttachmentPoint.SECONDARY).check(); - await clickModalButton(page, 'Apply'); - - await page.keyboard.press('Control+r'); - await page.keyboard.press('Control+r'); - await page.mouse.click(x, y); - await selectRGroup(page, 'R5'); - await clickModalButton(page, 'Apply'); - }); - - test('R-Group definition is not deleted when root structure was deleted', async ({ - page, - }) => { - /* Test case: EPMLSOPKET-1591 - Description: R-Group definition is not deleted when root structure was deleted - */ - await openFileAndAddToCanvas('R-fragment-structure.mol', page); - await page.getByText('R8').click(); - await page.keyboard.press('Delete'); - }); - - test('Delete R-Group member', async ({ page }) => { - /* Test case: EPMLSOPKET-1590 - Description: Delete R-Group member - */ - await openFileAndAddToCanvas('R-fragment-structure.mol', page); - - await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); - await page.getByText(rGroupFromFile).click(); - await page.keyboard.press('Delete'); - await takeEditorScreenshot(page); - - await selectTopPanelButton(TopPanelButton.Undo, page); - await delay(DELAY_IN_SECONDS.THREE); - - await selectLeftPanelButton(LeftPanelButton.Erase, page); - await page.getByText(rGroupFromFile).click(); - await takeEditorScreenshot(page); - - await selectTopPanelButton(TopPanelButton.Undo, page); - await delay(DELAY_IN_SECONDS.THREE); - - await page.keyboard.press('Control+a'); - await page.keyboard.press('Control+Delete'); - }); -}); diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Add-attachment-point-to-the-R-Group-member-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Add-attachment-point-to-the-R-Group-member-1-chromium-linux.png deleted file mode 100644 index 7386db2fa2..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Add-attachment-point-to-the-R-Group-member-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Brackets-rendering-for-whole-r-group-structure-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Brackets-rendering-for-whole-r-group-structure-1-chromium-linux.png deleted file mode 100644 index 40c70a772a..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Brackets-rendering-for-whole-r-group-structure-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Brackets-rendering-for-whole-r-group-structure-even-with-attachment-points-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Brackets-rendering-for-whole-r-group-structure-even-with-attachment-points-1-chromium-linux.png deleted file mode 100644 index dfd4bb2b83..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Brackets-rendering-for-whole-r-group-structure-even-with-attachment-points-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-multiple-R-Group-members-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-multiple-R-Group-members-1-chromium-linux.png deleted file mode 100644 index f8bcf2f554..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-multiple-R-Group-members-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-single-R-Group-member-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-single-R-Group-member-1-chromium-linux.png deleted file mode 100644 index 4f6c87a407..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Change-R-Group-definition-for-single-R-Group-member-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-Single-R-Fragment-Group-member-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-Single-R-Fragment-Group-member-1-chromium-linux.png deleted file mode 100644 index df4e672544..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-Single-R-Fragment-Group-member-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-several-R-Group-members-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-several-R-Group-members-1-chromium-linux.png deleted file mode 100644 index 4b201fd8f4..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Create-several-R-Group-members-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Define-a-structure-with-attachment-points-as-R-Group-member-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Define-a-structure-with-attachment-points-as-R-Group-member-1-chromium-linux.png deleted file mode 100644 index 753907ae22..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Define-a-structure-with-attachment-points-as-R-Group-member-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-1-chromium-linux.png deleted file mode 100644 index f06b6b21a7..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-2-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-2-chromium-linux.png deleted file mode 100644 index 9dddcaab29..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-2-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-UI-Verification-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-UI-Verification-1-chromium-linux.png deleted file mode 100644 index 1a9114ca62..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-UI-Verification-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-dialog-cancelling-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-dialog-cancelling-1-chromium-linux.png deleted file mode 100644 index ae705faaf7..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-dialog-cancelling-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-dialog-opening-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-dialog-opening-1-chromium-linux.png deleted file mode 100644 index ef7bb588b9..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Fragment-Group-dialog-opening-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Group-definition-is-not-deleted-when-root-structure-was-deleted-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Group-definition-is-not-deleted-when-root-structure-was-deleted-1-chromium-linux.png deleted file mode 100644 index 9dddcaab29..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-R-Group-definition-is-not-deleted-when-root-structure-was-deleted-1-chromium-linux.png and /dev/null differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Remove-R-Group-member-from-R-Group-1-chromium-linux.png b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Remove-R-Group-member-from-R-Group-1-chromium-linux.png deleted file mode 100644 index d5ae031125..0000000000 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Remove-R-Group-member-from-R-Group-1-chromium-linux.png and /dev/null differ 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 73e4e13abe..78cb66876e 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 @@ -91,7 +91,10 @@ test.describe('Plus and Arrows tools ', () => { */ for (const tool of Object.values(ArrowTool)) { test(` ${tool} check`, async ({ page }) => { - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, tool); await clickOnTheCanvas(page, xOffsetFromCenter, 0); await delay(DELAY_IN_SECONDS.ONE); @@ -124,7 +127,7 @@ test.describe('Plus and Arrows tools ', () => { await selectLeftPanelButton(LeftPanelButton.ArrowOpenAngleTool, page); await moveMouseToTheMiddleOfTheScreen(page); const { x, y } = await getCoordinatesOfTheMiddleOfTheScreen(page); - dragMouseTo(x + 100, y + 100, page); + await dragMouseTo(x + 100, y + 100, page); await takeEditorScreenshot(page); await copyAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); @@ -141,7 +144,7 @@ test.describe('Plus and Arrows tools ', () => { */ const xOffsetFromCenter1 = -235; const xOffsetFromCenter2 = 235; - await openFileAndAddToCanvas('four-structures.mol', page); + await openFileAndAddToCanvas('Molfiles-V2000/four-structures.mol', page); await selectLeftPanelButton(LeftPanelButton.ReactionPlusTool, page); await clickOnTheCanvas(page, xOffsetFromCenter1, 0); await clickOnTheCanvas(page, xOffsetFromCenter2, 0); @@ -176,7 +179,7 @@ test.describe('Plus and Arrows tools ', () => { */ let point: Point; test.beforeEach(async ({ page }) => { - await openFileAndAddToCanvas('Rxn-V3000/reaction-3.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/reaction-3.rxn', page); await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); point = await getCoordinatesOfTheMiddleOfTheScreen(page); }); @@ -244,7 +247,7 @@ test.describe('Plus and Arrows tools ', () => { */ let point: Point; test.beforeEach(async ({ page }) => { - await openFileAndAddToCanvas('Rxn-V3000/reaction-3.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/reaction-3.rxn', page); await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); point = await getCoordinatesOfTheMiddleOfTheScreen(page); }); @@ -312,7 +315,10 @@ test.describe('Plus and Arrows tools ', () => { */ let point: Point; test.beforeEach(async ({ page }) => { - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, ArrowTool.ARROW_EQUILIBRIUM_FILLED_HALF_BOW); await clickOnTheCanvas(page, -40, 0); point = await getCoordinatesOfTheMiddleOfTheScreen(page); @@ -394,7 +400,10 @@ test.describe('Plus and Arrows tools ', () => { * Test case: EPMLSOPKET-2881 * Description: Actions on the reaction with non-default reaction arrows */ - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, ArrowTool.ARROW_FAILED); const point = await getCoordinatesOfTheMiddleOfTheScreen(page); await page.mouse.move(point.x - 30, point.y); @@ -433,7 +442,10 @@ test.describe('Plus and Arrows tools ', () => { * Description: Save/Open structure with non-default reaction in KET file */ test('add default arrow and save in KET file', async ({ page }) => { - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, ArrowTool.ARROW_OPEN_ANGLE); const offsetFromCenter = -35; await clickOnTheCanvas(page, offsetFromCenter, 0); @@ -456,7 +468,10 @@ test.describe('Plus and Arrows tools ', () => { * Description: Save/Open structure with non-default reaction in KET file */ test('add non default arrow and save in KET file', async ({ page }) => { - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, ArrowTool.ARROW_EQUILIBRIUM_FILLED_HALF_BOW); const offsetFromCenter = -35; await clickOnTheCanvas(page, offsetFromCenter, 0); @@ -479,7 +494,10 @@ test.describe('Plus and Arrows tools ', () => { * Description: Save/Open structure with non-default reaction in RXN file */ test('add non default arrow and save in RXN file', async ({ page }) => { - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, ArrowTool.ARROW_EQUILIBRIUM_FILLED_HALF_BOW); await clickOnTheCanvas(page, xOffsetFromCenter, 0); await delay(DELAY_IN_SECONDS.THREE); @@ -501,7 +519,10 @@ test.describe('Plus and Arrows tools ', () => { */ for (const { name, fileExtension } of formatsForSave) { test(`save in ${fileExtension} file`, async ({ page }) => { - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, ArrowTool.ARROW_OPEN_ANGLE); await clickOnTheCanvas(page, xOffsetFromCenter, 15); await clickOnTheCanvas(page, xOffsetFromCenter, -15); @@ -525,7 +546,10 @@ test.describe('Plus and Arrows tools ', () => { */ for (const { name, fileExtension } of formatsForSave) { test(`save in ${fileExtension} file`, async ({ page }) => { - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, ArrowTool.ARROW_EQUILIBRIUM_OPEN_ANGLE); await clickOnTheCanvas(page, xOffsetFromCenter, 0); await delay(DELAY_IN_SECONDS.THREE); @@ -547,7 +571,10 @@ test.describe('Plus and Arrows tools ', () => { * Description: Resizing reaction arrow - Saving */ test('Resize and save', async ({ page }) => { - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await selectNestedTool(page, ArrowTool.ARROW_FILLED_BOW); await clickOnTheCanvas(page, xOffsetFromCenter, 0); const { x, y } = await getCoordinatesOfTheMiddleOfTheScreen(page); @@ -560,7 +587,10 @@ test.describe('Plus and Arrows tools ', () => { }); test('open files', async ({ page }) => { - await openFileAndAddToCanvas(`resizing-reaction-arrow-saving.rxn`, page); + await openFileAndAddToCanvas( + `Rxn-V2000/resizing-reaction-arrow-saving.rxn`, + page, + ); await takeEditorScreenshot(page); await selectTopPanelButton(TopPanelButton.Clear, page); await openFileAndAddToCanvas( 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 679ce1c0f7..3c840c40cd 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 @@ -167,12 +167,12 @@ test.describe('Reagents RXN format', () => { ); const expectedFile = await getRxn(page, 'v3000'); await saveToFile( - 'benzene-arrow-benzene-reagent-nh3-expected.rxn', + 'Rxn-V3000/benzene-arrow-benzene-reagent-nh3-expected.rxn', expectedFile, ); const rxnFileExpected = await readFileContents( - 'tests/test-data/benzene-arrow-benzene-reagent-nh3-expected.rxn', + 'tests/test-data/Rxn-V3000/benzene-arrow-benzene-reagent-nh3-expected.rxn', ); const rxnFile = await getRxn(page, 'v3000'); // eslint-disable-next-line no-magic-numbers 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 6f1cdaaf4f..9797123d24 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 @@ -99,7 +99,7 @@ test.describe('Reagents SMILES format', () => { }); test(`Detection molecule as reagent - and write reagent information in "Extended SMILES" format in "Preview" tab @check`, async ({ + and write reagent information in "Extended SMILES" format in "Preview" tab`, async ({ page, }) => { /* diff --git a/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts-snapshots/Reagents-SMILES-format-Detection-molecule-as-r-fafa7--in-Extended-SMILES-format-in-Preview-tab-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts-snapshots/Reagents-SMILES-format-Detection-molecule-as-r-fafa7--in-Extended-SMILES-format-in-Preview-tab-1-chromium-linux.png index a1a493a1ab..0343bca086 100644 Binary files a/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts-snapshots/Reagents-SMILES-format-Detection-molecule-as-r-fafa7--in-Extended-SMILES-format-in-Preview-tab-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts-snapshots/Reagents-SMILES-format-Detection-molecule-as-r-fafa7--in-Extended-SMILES-format-in-Preview-tab-1-chromium-linux.png differ 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 4cbd81accb..183a84b9f6 100644 --- a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts +++ b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts @@ -24,7 +24,10 @@ test.describe('Reagents molecule above arrow', () => { Test case: EPMLSOPKET-4680 Description: File opens with the reagent NH3 on top of the arrow */ - await openFileAndAddToCanvas('benzene-arrow-benzene-reagent-nh3.rxn', page); + await openFileAndAddToCanvas( + 'Rxn-V3000/benzene-arrow-benzene-reagent-nh3.rxn', + page, + ); }); test('Open File CDXML with reagent NH3 above arrow', async ({ page }) => { @@ -33,7 +36,7 @@ test.describe('Reagents molecule above arrow', () => { Description: File opens with the reagent NH3 on top of the arrow */ await openFileAndAddToCanvas( - 'benzene-arrow-benzene-reagent-nh3.cdxml', + 'CDXML/benzene-arrow-benzene-reagent-nh3.cdxml', 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 567831ff37..2f83bb5c38 100644 --- a/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts +++ b/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts @@ -22,7 +22,10 @@ test.describe('Reagents molecule below arrow', () => { Test case: EPMLSOPKET-4723 Description: File opens with the reagent HCl below the arrow */ - await openFileAndAddToCanvas('benzene-arrow-benzene-reagent-hcl.rxn', page); + await openFileAndAddToCanvas( + 'Rxn-V3000/benzene-arrow-benzene-reagent-hcl.rxn', + page, + ); }); test('Open File CDXML with reagent HCl below arrow', async ({ page }) => { @@ -31,7 +34,7 @@ test.describe('Reagents molecule below arrow', () => { Description: File opens with the reagent HCl below the arrow */ await openFileAndAddToCanvas( - 'benzene-arrow-benzene-reagent-hcl.cdxml', + 'CDXML/benzene-arrow-benzene-reagent-hcl.cdxml', 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 cde61e4659..8172e0b522 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 @@ -26,8 +26,8 @@ import { screenshotBetweenUndoRedo, setAttachmentPoints, AttachmentPoint, - openFile, } from '@utils'; + import { getAtomByIndex } from '@utils/canvas/atoms'; import { getRotationHandleCoordinates } from '@utils/clicks/selectButtonByTitle'; import { getMolfile, getRxn, getSmiles } from '@utils/formats'; @@ -288,7 +288,6 @@ test.describe('Attachment Point Tool', () => { and plus sign(s) are present on the canvas. */ await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); - await selectNestedTool(page, RgroupTool.ATTACHMENT_POINTS); await setAttachmentPoints( page, @@ -312,7 +311,7 @@ test.describe('Attachment Point Tool', () => { ); }); - test.fixme('Copy/Paste actions', async ({ page }) => { + test('Copy/Paste actions', async ({ page }) => { /* Test case: EPMLSOPKET-1648 Description: Pasted structures are displayed with correct attachment points. @@ -321,11 +320,10 @@ test.describe('Attachment Point Tool', () => { await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await copyAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); - await screenshotBetweenUndoRedo(page); }); - test.fixme('Cut/Paste actions', async ({ page }) => { + test('Cut/Paste actions', async ({ page }) => { /* Test case: EPMLSOPKET-1648 Description: Pasted structures are displayed with correct attachment points. @@ -455,7 +453,6 @@ test.describe('Attachment Point Tool', () => { 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); - const METADATA_STRING_INDEX = [2, 7, 30, 37]; const { fileExpected: rxnFileExpected, file: rxnFile } = await receiveFileComparisonData({ @@ -478,7 +475,6 @@ test.describe('Attachment Point Tool', () => { 'reaction-with-arrow-and-plus-expectedV3000.rxn', expectedFile, ); - const METADATA_STRING_INDEX = [2]; const { fileExpected: rxnFileExpected, file: rxnFile } = await receiveFileComparisonData({ @@ -499,7 +495,6 @@ test.describe('Attachment Point Tool', () => { await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getSmiles(page); await saveToFile('chain-with-attachment-points-expected.smi', expectedFile); - const { fileExpected: smiFileExpected, file: smiFile } = await receiveFileComparisonData({ page, @@ -522,7 +517,6 @@ test.describe('Attachment Point Tool', () => { await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getSmiles(page); await saveToFile('chain-with-attachment-points-expected.smi', expectedFile); - const { fileExpected: smiFileExpected, file: smiFile } = await receiveFileComparisonData({ page, @@ -551,7 +545,6 @@ test.describe('Attachment Point Tool', () => { await selectTopPanelButton(TopPanelButton.Clean, page); await delay(DELAY_IN_SECONDS.SEVEN); - await takeEditorScreenshot(page); }, ); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Clean-Up-and-Layout-distorted-chain-with-attachment-points-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Clean-Up-and-Layout-distorted-chain-with-attachment-points-1-chromium-linux.png new file mode 100644 index 0000000000..fbc903df85 Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Clean-Up-and-Layout-distorted-chain-with-attachment-points-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Clean-Up-and-Layout-distorted-chain-with-attachment-points-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Clean-Up-and-Layout-distorted-chain-with-attachment-points-2-chromium-linux.png new file mode 100644 index 0000000000..8aaa23af4c Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Clean-Up-and-Layout-distorted-chain-with-attachment-points-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-1-chromium-linux.png index 9cccf09a28..2e885676ec 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-2-chromium-linux.png index d580fea7a3..c40b0fbe12 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-check-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-check-1-chromium-linux.png new file mode 100644 index 0000000000..2e885676ec Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-check-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-check-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-check-2-chromium-linux.png new file mode 100644 index 0000000000..c40b0fbe12 Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Copy-Paste-actions-check-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Cut-Paste-actions-2-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Cut-Paste-actions-2-chromium-linux.png index b92e3a85eb..2d3bc72538 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Cut-Paste-actions-2-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Cut-Paste-actions-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Erase-Tool/erase-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Erase-Tool/erase-tool.spec.ts index ecd800700a..250ec5297a 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Erase-Tool/erase-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Erase-Tool/erase-tool.spec.ts @@ -22,7 +22,10 @@ test.describe('Erase Tool', () => { // TO DO: here in both tests we have some issue with openFileAndAddToCanvas() function it need proper investigation test.beforeEach(async ({ page }) => { await page.goto(''); - await openFileAndAddToCanvas('benzene-bromobutane-reaction.rxn', page); + await openFileAndAddToCanvas( + 'Rxn-V2000/benzene-bromobutane-reaction.rxn', + page, + ); await selectTool(LeftPanelButton.Erase, page); }); 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 05cb3fcc62..6c9bc46fb5 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 @@ -308,7 +308,10 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1594 Description: The saved *.mol file is opened and can be edited. */ - await openFileAndAddToCanvas('benzene-with-three-atoms.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-with-three-atoms.mol', + page, + ); await doubleClickOnAtom(page, 'N', 0); @@ -328,16 +331,22 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1594 Description: The structure is saved as *.mol file. */ - await openFileAndAddToCanvas('benzene-with-three-atoms.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-with-three-atoms.mol', + page, + ); const expectedFile = await getMolfile(page, 'v2000'); - await saveToFile('benzene-with-three-atoms-expected.mol', expectedFile); + await saveToFile( + 'Molfiles-V2000/benzene-with-three-atoms-expected.mol', + expectedFile, + ); const METADATA_STRING_INDEX = [1]; const { fileExpected: molFileExpected, file: molFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/benzene-with-three-atoms-expected.mol', + 'tests/test-data/Molfiles-V2000/benzene-with-three-atoms-expected.mol', fileFormat: 'v2000', metaDataIndexes: METADATA_STRING_INDEX, }); @@ -367,7 +376,10 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1596 Description: The appeared symbol is colored with the same color as in Periodic Table and added to two different rings. */ - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); await page.keyboard.down('Shift'); await clickOnAtom(page, 'N', 0); @@ -386,16 +398,22 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1596 Description: The structure is saved as *.mol file. */ - await openFileAndAddToCanvas('benzene-and-cyclopentadiene.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-and-cyclopentadiene.mol', + page, + ); const expectedFile = await getMolfile(page, 'v2000'); - await saveToFile('benzene-and-cyclopentadiene-expected.mol', expectedFile); + await saveToFile( + 'Molfiles-V2000/benzene-and-cyclopentadiene-expected.mol', + expectedFile, + ); const METADATA_STRING_INDEX = [1]; const { fileExpected: molFileExpected, file: molFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/benzene-and-cyclopentadiene-expected.mol', + 'tests/test-data/Molfiles-V2000/benzene-and-cyclopentadiene-expected.mol', fileFormat: 'v2000', metaDataIndexes: METADATA_STRING_INDEX, }); @@ -441,7 +459,10 @@ test.describe('Atom Properties', () => { The 'Alias' field contains the correct edited text. The correct edited alias 'TesREasd!@' and Label ('Sb' for our example) appears for the edited atom. */ - await openFileAndAddToCanvas('benzene-ring-with-alias.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-ring-with-alias.mol', + page, + ); await doubleClickOnAtom(page, 'C', 0); @@ -509,15 +530,22 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1606 Description: The structure is saved as *.mol file. */ - await openFileAndAddToCanvas('benzene-with-charge.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-with-charge.mol', + page, + ); const expectedFile = await getMolfile(page, 'v2000'); - await saveToFile('benzene-with-charge-expected.mol', expectedFile); + await saveToFile( + 'Molfiles-V2000/benzene-with-charge-expected.mol', + expectedFile, + ); const METADATA_STRING_INDEX = [1]; const { fileExpected: molFileExpected, file: molFile } = await receiveFileComparisonData({ page, - expectedFileName: 'tests/test-data/benzene-with-charge-expected.mol', + expectedFileName: + 'tests/test-data/Molfiles-V2000/benzene-with-charge-expected.mol', fileFormat: 'v2000', metaDataIndexes: METADATA_STRING_INDEX, }); @@ -525,7 +553,7 @@ test.describe('Atom Properties', () => { expect(molFile).toEqual(molFileExpected); }); - test.fixme('Change charge on different atoms', async ({ page }) => { + test('Change charge on different atoms', async ({ page }) => { /* Test case: EPMLSOPKET-1607 Description: The Charge are changed for three atoms (S, F, I). @@ -545,7 +573,7 @@ test.describe('Atom Properties', () => { await fillChargeForAtom(page, '3', 'Apply'); }); - test.fixme('Typing in Charge for sigle atom', async ({ page }) => { + test('Typing in Charge for sigle atom', async ({ page }) => { /* Test case: EPMLSOPKET-1608 Description: The Charge are changed for three atoms (S, F, I). @@ -623,7 +651,7 @@ test.describe('Atom Properties', () => { expect(molFile).toEqual(molFileExpected); }); - test.fixme('Change Isotope value on different atoms', async ({ page }) => { + test('Change Isotope value on different atoms', async ({ page }) => { /* Test case: EPMLSOPKET-1616 Description: The typed isotope value appears near the selected atoms only.Number is colored same as atoms. @@ -658,29 +686,28 @@ test.describe('Atom Properties', () => { await pressButton(page, 'Apply'); }); - test.fixme( - 'Typing in isotope - several atoms through Label Edit modal', - async ({ page }) => { - /* + test('Typing in isotope - several atoms through Label Edit modal', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1618 Description: Only last selected atom is replaced with the typed atom symbol and isotope. */ - await openFileAndAddToCanvas('Heteroatoms.mol', page); + await openFileAndAddToCanvas('Heteroatoms.mol', page); - await page.keyboard.down('Shift'); - await clickOnAtom(page, 'S', 0); + await page.keyboard.down('Shift'); + await clickOnAtom(page, 'S', 0); - await clickOnAtom(page, 'F', 0); - await page.keyboard.up('Shift'); + await clickOnAtom(page, 'F', 0); + await page.keyboard.up('Shift'); - await moveOnAtom(page, 'S', 0); - await page.mouse.down(); - await page.waitForTimeout(2000); + await moveOnAtom(page, 'S', 0); + await page.mouse.down(); + await page.waitForTimeout(2000); - await page.getByLabel('Atom').fill('18S'); - await pressButton(page, 'Apply'); - }, - ); + await page.getByLabel('Atom').fill('18S'); + await pressButton(page, 'Apply'); + }); test('Add Valence in modal and press Cancel', async ({ page }) => { /* @@ -732,7 +759,7 @@ test.describe('Atom Properties', () => { expect(molFile).toEqual(molFileExpected); }); - test.fixme('Change Valence value on different atoms', async ({ page }) => { + test('Change Valence value on different atoms', async ({ page }) => { /* Test case: EPMLSOPKET-1620 Description: The typed Valence value appears near the selected atoms only. @@ -844,7 +871,7 @@ test.describe('Atom Properties', () => { await pressButton(page, 'Apply'); }); - test.fixme('Add Radicals value on different atoms', async ({ page }) => { + test('Add Radicals value on different atoms', async ({ page }) => { /* Test case: EPMLSOPKET-1635 Description: The typed Valence value appears near the selected atoms only. @@ -1405,37 +1432,35 @@ test.describe('Atom Properties', () => { await selectReactionFlagsInversion(page, 'Inverts', 'Cancel'); }); - test.fixme( - 'Add Reaction flags - Inversion (Inverts) and Exact change in modal and press Apply', - async ({ page }) => { - /* + test('Add Reaction flags - Inversion (Inverts) and Exact change in modal and press Apply', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1650 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'); - await selectExactChange(page, 'Apply'); - }, - ); + await doubleClickOnAtom(page, 'C', 3); + await selectReactionFlagsInversion(page, 'Inverts'); + await selectExactChange(page, 'Apply'); + }); - test.fixme( - 'Add Reaction flags - Inversion (Retains) and Exact change in modal and press Apply', - async ({ page }) => { - /* + test('Add Reaction flags - Inversion (Retains) and Exact change in modal and press Apply', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1650 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'); - await selectExactChange(page, 'Apply'); - }, - ); + await doubleClickOnAtom(page, 'C', 3); + await selectReactionFlagsInversion(page, 'Retains'); + await selectExactChange(page, 'Apply'); + }); test('Reaction flags information saved as *.mol file', async ({ page }) => { /* diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Radicals-value-on-different-atoms-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Radicals-value-on-different-atoms-1-chromium-linux.png index 2a29c7cbe2..1eaf878c5b 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Radicals-value-on-different-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Radicals-value-on-different-atoms-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Reaction-flags---Inversion-Inverts-and-Exact-change-in-modal-and-press-Apply-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Reaction-flags---Inversion-Inverts-and-Exact-change-in-modal-and-press-Apply-1-chromium-linux.png index 9c127a3696..2d94685b6b 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Reaction-flags---Inversion-Inverts-and-Exact-change-in-modal-and-press-Apply-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Reaction-flags---Inversion-Inverts-and-Exact-change-in-modal-and-press-Apply-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Reaction-flags---Inversion-Retains-and-Exact-change-in-modal-and-press-Apply-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Reaction-flags---Inversion-Retains-and-Exact-change-in-modal-and-press-Apply-1-chromium-linux.png index 43226efc50..d015fe0d2c 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Reaction-flags---Inversion-Retains-and-Exact-change-in-modal-and-press-Apply-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Add-Reaction-flags---Inversion-Retains-and-Exact-change-in-modal-and-press-Apply-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Isotope-value-on-different-atoms-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Isotope-value-on-different-atoms-1-chromium-linux.png index 8a35688456..cb020efab4 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Isotope-value-on-different-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Isotope-value-on-different-atoms-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Valence-value-on-different-atoms-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Valence-value-on-different-atoms-1-chromium-linux.png index 7106481d2e..eb6c214699 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Valence-value-on-different-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-Valence-value-on-different-atoms-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-charge-on-different-atoms-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-charge-on-different-atoms-1-chromium-linux.png index 5b7133ad1b..10dd5e07d1 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-charge-on-different-atoms-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Change-charge-on-different-atoms-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-Charge-for-sigle-atom-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-Charge-for-sigle-atom-1-chromium-linux.png index 4f6d35a23b..afc6f59bc8 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-Charge-for-sigle-atom-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-Charge-for-sigle-atom-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-isotope---several-atoms-through-Label-Edit-modal-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-isotope---several-atoms-through-Label-Edit-modal-1-chromium-linux.png index 8746930b20..b2b4b709a7 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-isotope---several-atoms-through-Label-Edit-modal-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts-snapshots/Atom-Properties-Typing-in-isotope---several-atoms-through-Label-Edit-modal-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts new file mode 100644 index 0000000000..012f3d3b32 --- /dev/null +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts @@ -0,0 +1,118 @@ +import { test } from '@playwright/test'; +import { + takeEditorScreenshot, + openFileAndAddToCanvas, + takeLeftToolbarScreenshot, + selectRingButton, + RingButton, + moveOnAtom, + clickInTheMiddleOfTheScreen, + resetCurrentTool, + selectLeftPanelButton, + LeftPanelButton, + clickOnAtom, +} from '@utils'; + +test.describe('Charge tool', () => { + test.beforeEach(async ({ page }) => { + await page.goto(''); + }); + + test.afterEach(async ({ page }) => { + await takeEditorScreenshot(page); + }); + + test('Hot key for the Charge Plus Tools', async ({ page }) => { + /* + Test case: EPMLSOPKET-1664 + Description: Charge Plus is applied to the structure atom. + */ + const anyAtom = 0; + await selectRingButton(RingButton.Benzene, page); + await clickInTheMiddleOfTheScreen(page); + await moveOnAtom(page, 'C', anyAtom); + await page.keyboard.press('Shift++'); + await resetCurrentTool(page); + }); + + test('Hot key for the Charge Minus Tools', async ({ page }) => { + /* + Test case: EPMLSOPKET-1664 + Description: Charge Minus is applied to the structure atom. + */ + const anyAtom = 0; + await selectRingButton(RingButton.Benzene, page); + await clickInTheMiddleOfTheScreen(page); + await moveOnAtom(page, 'C', anyAtom); + await page.keyboard.press('-'); + await resetCurrentTool(page); + }); + + test('Change charge on different atoms', async ({ page }) => { + /* + Test case: EPMLSOPKET-1665 + Description: Charge Minus and Charge Plus is applied to the structure atom. + */ + const anyAtom = 0; + const anotherAnyAtom = 2; + await openFileAndAddToCanvas('Molfiles-V2000/heteroatoms.mol', page); + await selectLeftPanelButton(LeftPanelButton.ChargePlus, page); + await clickOnAtom(page, 'N', anyAtom); + await clickOnAtom(page, 'O', anyAtom); + await selectLeftPanelButton(LeftPanelButton.ChargeMinus, page); + await clickOnAtom(page, 'S', anyAtom); + await clickOnAtom(page, 'O', anotherAnyAtom); + }); + + test('Check that pressing the hot button Charge Plus on an atom applies the correct charge', async ({ + page, + }) => { + /* + Test case: EPMLSOPKET-8919 + Description: Charge Plus is applied to the structure atom. + When you click outside atom atoms are not changed. + */ + const anyAtom = 0; + const x = 300; + const y = 300; + await openFileAndAddToCanvas('Molfiles-V2000/heteroatoms.mol', page); + await moveOnAtom(page, 'C', anyAtom); + await page.keyboard.press('Shift++'); + await page.mouse.move(x, y); + await page.keyboard.press('Shift++'); + }); + + test('Check that pressing the hot button Charge Minus on an atom applies the correct charge', async ({ + page, + }) => { + /* + Test case: EPMLSOPKET-8919 + Description: Charge Minus is applied to the structure atom. + When you click outside atom atoms are not changed. + */ + const anyAtom = 0; + const x = 300; + const y = 300; + await openFileAndAddToCanvas('Molfiles-V2000/heteroatoms.mol', page); + await moveOnAtom(page, 'C', anyAtom); + await page.keyboard.press('-'); + await page.mouse.move(x, y); + await page.keyboard.press('-'); + }); +}); + +test.describe('Charge tool', () => { + test.beforeEach(async ({ page }) => { + await page.goto(''); + }); + + test('Verify the icon and tooltips for the Charge Plus/Charge Minus button', async ({ + page, + }) => { + /* + Test case: EPMLSOPKET-1662, EPMLSOPKET-1663 + Description: The correct icon for the 'Charge Plus' and 'Charge Minus' is present in the Toolbar. + */ + await takeLeftToolbarScreenshot(page); + }); +}); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Change-charge-on-different-atoms-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Change-charge-on-different-atoms-1-chromium-linux.png new file mode 100644 index 0000000000..e6a66d93b5 Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Change-charge-on-different-atoms-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Check-that-pressing-the-hot-button-Charge-Minus-on-an-atom-applies-the-correct-charge-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Check-that-pressing-the-hot-button-Charge-Minus-on-an-atom-applies-the-correct-charge-1-chromium-linux.png new file mode 100644 index 0000000000..f9af7f8846 Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Check-that-pressing-the-hot-button-Charge-Minus-on-an-atom-applies-the-correct-charge-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Check-that-pressing-the-hot-button-Charge-Plus-on-an-atom-applies-the-correct-charge-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Check-that-pressing-the-hot-button-Charge-Plus-on-an-atom-applies-the-correct-charge-1-chromium-linux.png new file mode 100644 index 0000000000..f508bd3fca Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Check-that-pressing-the-hot-button-Charge-Plus-on-an-atom-applies-the-correct-charge-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Hot-key-for-the-Charge-Minus-Tools-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Hot-key-for-the-Charge-Minus-Tools-1-chromium-linux.png new file mode 100644 index 0000000000..eff9d8d0a0 Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Hot-key-for-the-Charge-Minus-Tools-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Hot-key-for-the-Charge-Plus-Tools-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Hot-key-for-the-Charge-Plus-Tools-1-chromium-linux.png new file mode 100644 index 0000000000..67803ffac7 Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Hot-key-for-the-Charge-Plus-Tools-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Verify-the-icon-and-tooltips-for-the-Charge-Plus-Charge-Minus-button-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Verify-the-icon-and-tooltips-for-the-Charge-Plus-Charge-Minus-button-1-chromium-linux.png new file mode 100644 index 0000000000..1c662d7878 Binary files /dev/null and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Charge-Tool/charge-tool.spec.ts-snapshots/Charge-tool-Verify-the-icon-and-tooltips-for-the-Charge-Plus-Charge-Minus-button-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts index 028af405cd..70aab3ac21 100644 --- a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts +++ b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts @@ -43,22 +43,19 @@ test.describe('Templates - Functional Group Tools', () => { await takeEditorScreenshot(page); }); - test.fixme( - 'Add a Bond to a contracted Functional Group', - async ({ page }) => { - /* + test('Add a Bond to a contracted Functional Group', async ({ page }) => { + /* Test case: EPMLSOPKET-10086 Description: A bond is added to a contracted functional group and form a bond */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await page.getByRole('tab', { name: 'Functional Groups' }).click(); - await selectFunctionalGroups(FunctionalGroups.Boc, page); - await clickInTheMiddleOfTheScreen(page); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await page.getByRole('tab', { name: 'Functional Groups' }).click(); + await selectFunctionalGroups(FunctionalGroups.Boc, page); + await clickInTheMiddleOfTheScreen(page); - await selectLeftPanelButton(LeftPanelButton.SingleBond, page); - await clickInTheMiddleOfTheScreen(page); - }, - ); + await selectLeftPanelButton(LeftPanelButton.SingleBond, page); + await clickInTheMiddleOfTheScreen(page); + }); test('Add a Chain to a contracted Functional Group', async ({ page }) => { /* @@ -467,7 +464,7 @@ test.describe('Templates - Functional Group Tools2', () => { Test case: EPMLSOPKET-2917 Description: Functional Group is expanded on a Benzene ring. No overlapping. */ - await openFileAndAddToCanvas('benzene-bond-fg.mol', page); + await openFileAndAddToCanvas('Molfiles-V2000/benzene-bond-fg.mol', page); await page.getByText('Boc').click({ button: 'right' }); await page.getByText('Expand Abbreviation').click(); }); @@ -496,7 +493,10 @@ test.describe('Templates - Functional Group Tools2', () => { y2: 360, }; - await openFileAndAddToCanvas('benzene-with-two-bonds.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-with-two-bonds.mol', + page, + ); await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); await page.getByRole('tab', { name: 'Functional Groups' }).click(); await selectFunctionalGroups(FunctionalGroups.CO2Et, page); @@ -516,7 +516,7 @@ test.describe('Templates - Functional Group Tools2', () => { Test case: EPMLSOPKET-8927 Description: The Functional Group is added to all bonds without errors and distortions */ - await openFileAndAddToCanvas('benzene-with-bonds.mol', page); + await openFileAndAddToCanvas('Molfiles-V2000/benzene-with-bonds.mol', page); await clickInTheMiddleOfTheScreen(page); await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); await page.getByRole('tab', { name: 'Functional Groups' }).click(); @@ -565,79 +565,69 @@ test.describe('Templates - Functional Group Tools3', () => { await takeEditorScreenshot(page); }); - test.fixme( - 'Expand/Remove abbreviation context menu with selected tools', - async ({ page }) => { - /* + test('Expand/Remove abbreviation context menu with selected tools', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-3933 Description: Functional Group-Expand/Remove abbreviation context menu is shown */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await page.getByRole('tab', { name: 'Functional Groups' }).click(); - await selectFunctionalGroups(FunctionalGroups.CO2Et, page); - await clickInTheMiddleOfTheScreen(page); - - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.HandTool, - page, - ); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.RectangleSelection, - page, - ); - await selectLeftPanelToolClickAndScreenshot(LeftPanelButton.Erase, page); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.SingleBond, - page, - ); - await selectLeftPanelToolClickAndScreenshot(LeftPanelButton.Chain, page); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.ChargePlus, - page, - ); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.ChargeMinus, - page, - ); - - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.S_Group, - page, - ); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.ReactionPlusTool, - page, - ); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.ArrowOpenAngleTool, - page, - ); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.ReactionMappingTool, - page, - ); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.R_GroupLabelTool, - page, - ); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.ShapeEllipse, - page, - ); - await selectLeftPanelToolClickAndScreenshot( - LeftPanelButton.AddText, - page, - ); - - await selectRingButton(RingButton.Benzene, page); - await clickInTheMiddleOfTheScreen(page, 'right'); - await takeEditorScreenshot(page); - - await selectAtomInToolbar(AtomButton.Nitrogen, page); - await clickInTheMiddleOfTheScreen(page, 'right'); - await takeEditorScreenshot(page); - }, - ); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await page.getByRole('tab', { name: 'Functional Groups' }).click(); + await selectFunctionalGroups(FunctionalGroups.CO2Et, page); + await clickInTheMiddleOfTheScreen(page); + + await selectLeftPanelToolClickAndScreenshot(LeftPanelButton.HandTool, page); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.RectangleSelection, + page, + ); + await selectLeftPanelToolClickAndScreenshot(LeftPanelButton.Erase, page); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.SingleBond, + page, + ); + await selectLeftPanelToolClickAndScreenshot(LeftPanelButton.Chain, page); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.ChargePlus, + page, + ); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.ChargeMinus, + page, + ); + + await selectLeftPanelToolClickAndScreenshot(LeftPanelButton.S_Group, page); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.ReactionPlusTool, + page, + ); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.ArrowOpenAngleTool, + page, + ); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.ReactionMappingTool, + page, + ); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.R_GroupLabelTool, + page, + ); + await selectLeftPanelToolClickAndScreenshot( + LeftPanelButton.ShapeEllipse, + page, + ); + await selectLeftPanelToolClickAndScreenshot(LeftPanelButton.AddText, page); + + await selectRingButton(RingButton.Benzene, page); + await clickInTheMiddleOfTheScreen(page, 'right'); + await takeEditorScreenshot(page); + + await selectAtomInToolbar(AtomButton.Nitrogen, page); + await clickInTheMiddleOfTheScreen(page, 'right'); + await takeEditorScreenshot(page); + }); test('Expand/Contract/Remove Abbreviation with multiple FG', async ({ page, diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools-Add-a-Bond-to-a-contracted-Functional-Group-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools-Add-a-Bond-to-a-contracted-Functional-Group-1-chromium-linux.png index c82b7fb6cb..729ab70790 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools-Add-a-Bond-to-a-contracted-Functional-Group-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools-Add-a-Bond-to-a-contracted-Functional-Group-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-1-chromium-linux.png index 28b3997815..9c0edf59ac 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-10-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-10-chromium-linux.png index ed958be43b..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-10-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-10-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-11-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-11-chromium-linux.png index ed958be43b..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-11-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-11-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-12-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-12-chromium-linux.png index 199641f98a..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-12-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-12-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-13-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-13-chromium-linux.png index ed958be43b..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-13-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-13-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-14-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-14-chromium-linux.png index ed958be43b..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-14-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-14-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-15-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-15-chromium-linux.png index ed958be43b..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-15-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-15-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-16-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-16-chromium-linux.png index ed958be43b..90e78b92f3 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-16-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-16-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-2-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-2-chromium-linux.png index d5b866d65b..90e78b92f3 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-2-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-3-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-3-chromium-linux.png index d5b866d65b..90e78b92f3 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-3-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-3-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-4-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-4-chromium-linux.png index d5b866d65b..90e78b92f3 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-4-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-4-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-5-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-5-chromium-linux.png index d5b866d65b..90e78b92f3 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-5-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-5-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-6-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-6-chromium-linux.png index d5b866d65b..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-6-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-6-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-7-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-7-chromium-linux.png index d5b866d65b..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-7-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-7-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-8-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-8-chromium-linux.png index d5b866d65b..90e78b92f3 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-8-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-8-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-9-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-9-chromium-linux.png index d5b866d65b..02fa5667c1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-9-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts-snapshots/Templates---Functional-Group-Tools3-Expand-Remove-abbreviation-context-menu-with-selected-tools-9-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts index b9292dee3e..e4b6b7114b 100644 --- a/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts +++ b/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts @@ -41,7 +41,7 @@ test.describe('Click and drag FG on canvas', () => { await drawFGAndDrag(FunctionalGroups.Cbz, SHIFT, page); }); - test.skip('Boc forms a bond with Cbz functional group', async ({ page }) => { + test('Boc forms a bond with Cbz functional group', async ({ page }) => { /* Test case: EPMLSOPKET-11551 Description: when click & drag with an FG on FG it should forms a bond between it diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts-snapshots/Click-and-drag-FG-on-canvas-Boc-forms-a-bond-with-Cbz-functional-group-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts-snapshots/Click-and-drag-FG-on-canvas-Boc-forms-a-bond-with-Cbz-functional-group-1-chromium-linux.png index 386a735b4c..dd98228e2f 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts-snapshots/Click-and-drag-FG-on-canvas-Boc-forms-a-bond-with-Cbz-functional-group-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/click-and-drag-fg-on-canvas.spec.ts-snapshots/Click-and-drag-FG-on-canvas-Boc-forms-a-bond-with-Cbz-functional-group-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts index 434059c52c..0493848683 100644 --- a/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts +++ b/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts @@ -39,7 +39,7 @@ test.describe('Click Functional Group on canvas', () => { await clickInTheMiddleOfTheScreen(page); }); - test.skip('The Cbz replaces the Boc functional group', async ({ page }) => { + test('The Cbz replaces the Boc functional group', async ({ page }) => { /* Test case: EPMLSOPKET-10106 Description: when clicking with an FG template on an FG it should replace it @@ -53,7 +53,7 @@ test.describe('Click Functional Group on canvas', () => { await clickInTheMiddleOfTheScreen(page); }); - test.skip('The CCl3 replaces methane sulphonic acid', async ({ page }) => { + test('The CCl3 replaces methane sulphonic acid', async ({ page }) => { /* Test case: EPMLSOPKET-10107 Description: when clicking with an FG template on a Salts and Solvents it should replace it @@ -69,7 +69,7 @@ test.describe('Click Functional Group on canvas', () => { await clickInTheMiddleOfTheScreen(page); }); - test.skip('CO2tBu replaces the Cl atom', async ({ page }) => { + test('CO2tBu replaces the Cl atom', async ({ page }) => { /* Test case: EPMLSOPKET-10108 Description: when clicking with an FG template @@ -91,7 +91,7 @@ test.describe('Click Functional Group on canvas', () => { await clickInTheMiddleOfTheScreen(page); }); - test.skip('Ms replaces the Cbz functional group', async ({ page }) => { + test('Ms replaces the Cbz functional group', async ({ page }) => { /* Test case: EPMLSOPKET-10109 Description: when clicking with an FG template on an FG connected with bond to another atom it should replace it diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts-snapshots/Click-Functional-Group-on-canvas-CO2tBu-replaces-the-Cl-atom-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts-snapshots/Click-Functional-Group-on-canvas-CO2tBu-replaces-the-Cl-atom-1-chromium-linux.png index 79f12be988..dcb544f708 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts-snapshots/Click-Functional-Group-on-canvas-CO2tBu-replaces-the-Cl-atom-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts-snapshots/Click-Functional-Group-on-canvas-CO2tBu-replaces-the-Cl-atom-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts-snapshots/Click-Functional-Group-on-canvas-Ms-replaces-the-Cbz-functional-group-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts-snapshots/Click-Functional-Group-on-canvas-Ms-replaces-the-Cbz-functional-group-1-chromium-linux.png index 5fcb797708..f0f47d4b4a 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts-snapshots/Click-Functional-Group-on-canvas-Ms-replaces-the-Cbz-functional-group-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/click-fg-on-canvas.spec.ts-snapshots/Click-Functional-Group-on-canvas-Ms-replaces-the-Cbz-functional-group-1-chromium-linux.png differ 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 ef028628e1..ad6fce292d 100644 --- a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts +++ b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts @@ -569,7 +569,7 @@ test.describe('Functional Groups', () => { await resetCurrentTool(page); }); - test.skip('Hotkey for Atom can replace Functional Groups abbreviation', async ({ + test('Hotkey for Atom can replace Functional Groups abbreviation', async ({ page, }) => { /* @@ -655,7 +655,7 @@ test.describe('Functional Groups', () => { await page.getByText('Expand Abbreviation').click(); }); - test.skip('After expand a Functional Group hotkeys not stop working', async ({ + test('After expand a Functional Group hotkeys not stop working', async ({ page, }) => { /* diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-After-expand-a-Functional-Group-hotkeys-not-stop-working-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-After-expand-a-Functional-Group-hotkeys-not-stop-working-1-chromium-linux.png new file mode 100644 index 0000000000..4417fd6fa3 Binary files /dev/null and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-After-expand-a-Functional-Group-hotkeys-not-stop-working-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-3-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Hotkey-for-Atom-can-replace-Functional-Groups-abbreviation-1-chromium-linux.png similarity index 75% rename from ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-3-chromium-linux.png rename to ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Hotkey-for-Atom-can-replace-Functional-Groups-abbreviation-1-chromium-linux.png index b06752df37..bcc3e05611 100644 Binary files a/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-3-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Hotkey-for-Atom-can-replace-Functional-Groups-abbreviation-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Salts-and-Solvents/click-salts-on-canvas.spec.ts b/ketcher-autotests/tests/Templates/Salts-and-Solvents/click-salts-on-canvas.spec.ts index d3d0648139..8b4b1850f2 100644 --- a/ketcher-autotests/tests/Templates/Salts-and-Solvents/click-salts-on-canvas.spec.ts +++ b/ketcher-autotests/tests/Templates/Salts-and-Solvents/click-salts-on-canvas.spec.ts @@ -41,48 +41,41 @@ test.describe('Click Salts and Solvents on canvas', () => { await clickInTheMiddleOfTheScreen(page); }); - test.fixme( - 'The isobutanol replaces the Boc functional group', - async ({ page }) => { - /* + test('The isobutanol replaces the Boc functional group', async ({ page }) => { + /* Test case: EPMLSOPKET-10110 Description: when clicking with a Salts and Solvents on a FG it should replace it */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await page.getByRole('tab', { name: 'Functional Groups' }).click(); - await selectFunctionalGroups(FunctionalGroups.Boc, page); - await clickInTheMiddleOfTheScreen(page); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await page.getByRole('tab', { name: 'Functional Groups' }).click(); + await selectFunctionalGroups(FunctionalGroups.Boc, page); + await clickInTheMiddleOfTheScreen(page); - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await page.getByRole('tab', { name: 'Salts and Solvents' }).click(); - // function can't select Salt - await selectSaltsAndSolvents(SaltsAndSolvents.Isobutanol, page); - await clickInTheMiddleOfTheScreen(page); - }, - ); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await page.getByRole('tab', { name: 'Salts and Solvents' }).click(); + await selectSaltsAndSolvents(SaltsAndSolvents.Isobutanol, page); + await clickInTheMiddleOfTheScreen(page); + }); - test.fixme( - 'The t-butanol replaces methane sulphonic acid', - async ({ page }) => { - /* + test('The t-butanol replaces methane sulphonic acid', async ({ page }) => { + /* Test case: EPMLSOPKET-10110 Description: when clicking with a Salts and Solvents template on a Salts and Solvents it should replace it */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await page.getByRole('tab', { name: 'Salts and Solvents' }).click(); - await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page); - await clickInTheMiddleOfTheScreen(page); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await page.getByRole('tab', { name: 'Salts and Solvents' }).click(); + await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page); + await clickInTheMiddleOfTheScreen(page); - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await page.getByRole('tab', { name: 'Salts and Solvents' }).click(); - await selectSaltsAndSolvents(SaltsAndSolvents.TButanol, page); - await clickInTheMiddleOfTheScreen(page); - }, - ); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await page.getByRole('tab', { name: 'Salts and Solvents' }).click(); + await selectSaltsAndSolvents(SaltsAndSolvents.TButanol, page); + await clickInTheMiddleOfTheScreen(page); + }); // behaves unstable even locally, maybe because of tab opening - test.fixme('Formic acid places near the Cl atom', async ({ page }) => { + test('Formic acid places near the Cl atom', async ({ page }) => { /* Test case: EPMLSOPKET-10111 Description: when clicking with a Salts and Solvents template on an atom connected with diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/3D-Viewer/three-d-viewer.spec.ts b/ketcher-autotests/tests/User-Interface/Editing-Tools/3D-Viewer/three-d-viewer.spec.ts index 9c16446b07..041629a6ff 100644 --- a/ketcher-autotests/tests/User-Interface/Editing-Tools/3D-Viewer/three-d-viewer.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Editing-Tools/3D-Viewer/three-d-viewer.spec.ts @@ -53,7 +53,7 @@ test.describe.fixme('3D Viewer', () => { 3D window is opened. Benzene with heteroatom is drawn in it. Position of the structure on the canvas isn't changed. */ - await openFileAndAddToCanvas('benzene-br.mol', page); + await openFileAndAddToCanvas('Molfiles-V2000/benzene-br.mol', page); await selectTopPanelButton(TopPanelButton.ThreeD, page); // delay need to load 3D Viewer await delay(DELAY_IN_SECONDS.THREE); @@ -89,7 +89,10 @@ test.describe.fixme('3D Viewer', () => { Description: 3D window is opened. The structure with a circle inside the cycle is displayed in the window. The structure isn't changed. */ - await openFileAndAddToCanvas('benzene-with-aromatic-bonds.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-with-aromatic-bonds.mol', + page, + ); await selectTopPanelButton(TopPanelButton.ThreeD, page); // delay need to load 3D Viewer await delay(DELAY_IN_SECONDS.THREE); @@ -182,7 +185,7 @@ test.describe.fixme('3D Viewer', () => { 3D window is opened. Benzene with heteroatom is drawn in it. Position of the structure on the canvas is changed. */ - await openFileAndAddToCanvas('benzene-br.mol', page); + await openFileAndAddToCanvas('Molfiles-V2000/benzene-br.mol', page); const initialStructureData = await getKet(page); await selectTopPanelButton(TopPanelButton.ThreeD, page); // delay need to load 3D Viewer @@ -234,7 +237,10 @@ test.describe.fixme('3D Viewer', () => { Description: 3D window is opened. The structure with a circle inside the cycle is displayed in the window. The structure is changed. */ - await openFileAndAddToCanvas('benzene-with-aromatic-bonds.mol', page); + await openFileAndAddToCanvas( + 'Molfiles-V2000/benzene-with-aromatic-bonds.mol', + page, + ); const initialStructureData = await getKet(page); await selectTopPanelButton(TopPanelButton.ThreeD, page); // delay need to load 3D Viewer 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 bd8c447c11..63e71df892 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 @@ -889,6 +889,7 @@ test.describe('Copy/Cut/Paste Actions', () => { test.describe('Copy/Cut/Paste Actions', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Cut-button-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Cut-button-1-chromium-linux.png index 154974afb9..d04dd420e3 100644 Binary files a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Cut-button-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Cut-button-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Cut-button-2-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Cut-button-2-chromium-linux.png index c8c22e09ba..e29cdb0032 100644 Binary files a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Cut-button-2-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Cut-button-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Paste-button-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Paste-button-1-chromium-linux.png index 6e4577f467..d04dd420e3 100644 Binary files a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Paste-button-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts-snapshots/Copy-Cut-Paste-Actions-Paste-button-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-hcl.cdxml b/ketcher-autotests/tests/test-data/CDXML/benzene-arrow-benzene-reagent-hcl.cdxml similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-hcl.cdxml rename to ketcher-autotests/tests/test-data/CDXML/benzene-arrow-benzene-reagent-hcl.cdxml diff --git a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3.cdxml b/ketcher-autotests/tests/test-data/CDXML/benzene-arrow-benzene-reagent-nh3.cdxml similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3.cdxml rename to ketcher-autotests/tests/test-data/CDXML/benzene-arrow-benzene-reagent-nh3.cdxml diff --git a/ketcher-autotests/tests/test-data/JSON/attached-data-expected.json b/ketcher-autotests/tests/test-data/JSON/attached-data-expected.json index ea54274004..974e8c1b54 100644 --- a/ketcher-autotests/tests/test-data/JSON/attached-data-expected.json +++ b/ketcher-autotests/tests/test-data/JSON/attached-data-expected.json @@ -1 +1 @@ -CCCC[C@@H](C)[C@@H](C)CC \ No newline at end of file +CCCC[C@@H](C)[C@@H](C)CC |SgD:4,5:Purity:Purity = 96%::: :| \ No newline at end of file diff --git a/ketcher-autotests/tests/test-data/benzene-and-cyclopentadiene-expected.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-and-cyclopentadiene-expected.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-and-cyclopentadiene-expected.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-and-cyclopentadiene-expected.mol diff --git a/ketcher-autotests/tests/test-data/benzene-and-cyclopentadiene.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-and-cyclopentadiene.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-and-cyclopentadiene.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-and-cyclopentadiene.mol diff --git a/ketcher-autotests/tests/test-data/benzene-bond-fg.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-bond-fg.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-bond-fg.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-bond-fg.mol diff --git a/ketcher-autotests/tests/test-data/benzene-br.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-br.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-br.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-br.mol diff --git a/ketcher-autotests/tests/test-data/benzene-ring-with-alias.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-ring-with-alias.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-ring-with-alias.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-ring-with-alias.mol diff --git a/ketcher-autotests/tests/test-data/benzene-rings.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-rings.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-rings.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-rings.mol diff --git a/ketcher-autotests/tests/test-data/benzene-with-aromatic-bonds.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-aromatic-bonds.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-with-aromatic-bonds.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-aromatic-bonds.mol diff --git a/ketcher-autotests/tests/test-data/benzene-with-bonds.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-bonds.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-with-bonds.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-bonds.mol diff --git a/ketcher-autotests/tests/test-data/benzene-with-charge-expected.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-charge-expected.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-with-charge-expected.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-charge-expected.mol diff --git a/ketcher-autotests/tests/test-data/benzene-with-charge.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-charge.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-with-charge.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-charge.mol diff --git a/ketcher-autotests/tests/test-data/benzene-with-three-atoms-expected.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-three-atoms-expected.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-with-three-atoms-expected.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-three-atoms-expected.mol diff --git a/ketcher-autotests/tests/test-data/benzene-with-three-atoms.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-three-atoms.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-with-three-atoms.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-three-atoms.mol diff --git a/ketcher-autotests/tests/test-data/benzene-with-two-bonds.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-two-bonds.mol similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-with-two-bonds.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/benzene-with-two-bonds.mol diff --git a/ketcher-autotests/tests/test-data/four-structures.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/four-structures.mol similarity index 100% rename from ketcher-autotests/tests/test-data/four-structures.mol rename to ketcher-autotests/tests/test-data/Molfiles-V2000/four-structures.mol diff --git a/ketcher-autotests/tests/test-data/Molfiles-V2000/heteroatoms.mol b/ketcher-autotests/tests/test-data/Molfiles-V2000/heteroatoms.mol new file mode 100644 index 0000000000..fcd491c4c1 --- /dev/null +++ b/ketcher-autotests/tests/test-data/Molfiles-V2000/heteroatoms.mol @@ -0,0 +1,29 @@ + + Ketcher 5 82121512D 1 1.00000 0.00000 0 + + 12 12 0 0 0 999 V2000 + 11.4141 -6.4265 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 10.5005 -6.8332 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 9.8314 -6.0900 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 10.3313 -5.2240 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 11.3095 -5.4319 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 + 12.2801 -6.9265 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 13.1461 -6.4265 0.0000 S 0 0 0 0 0 0 0 0 0 0 0 0 + 14.0121 -6.9265 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 14.8782 -6.4265 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 12.2801 -7.9265 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 14.0121 -7.9265 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 + 15.7442 -6.9265 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 + 1 2 1 0 0 0 + 2 3 1 0 0 0 + 3 4 1 0 0 0 + 4 5 1 0 0 0 + 5 1 2 0 0 0 + 1 6 1 0 0 0 + 6 7 1 0 0 0 + 7 8 1 0 0 0 + 8 9 1 0 0 0 + 6 10 1 0 0 0 + 8 11 2 0 0 0 + 9 12 1 0 0 0 +M END diff --git a/ketcher-autotests/tests/test-data/allenes.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/allenes.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/allenes.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/allenes.rxn diff --git a/ketcher-autotests/tests/test-data/alter_mapping.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/alter-mapping.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/alter_mapping.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/alter-mapping.rxn diff --git a/ketcher-autotests/tests/test-data/benzene-bromination.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/benzene-bromination.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-bromination.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/benzene-bromination.rxn diff --git a/ketcher-autotests/tests/test-data/benzene-bromobutane-reaction.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/benzene-bromobutane-reaction.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-bromobutane-reaction.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/benzene-bromobutane-reaction.rxn diff --git a/ketcher-autotests/tests/test-data/for_MappingTools_10.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/for-mappingTools-10.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/for_MappingTools_10.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/for-mappingTools-10.rxn diff --git a/ketcher-autotests/tests/test-data/mapping_4_benzene.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/mapping-4-benzene.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/mapping_4_benzene.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/mapping-4-benzene.rxn diff --git a/ketcher-autotests/tests/test-data/Rxn-V3000/reaction-3.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/reaction-3.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/Rxn-V3000/reaction-3.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/reaction-3.rxn diff --git a/ketcher-autotests/tests/test-data/reaction_half.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/reaction-half.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/reaction_half.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/reaction-half.rxn diff --git a/ketcher-autotests/tests/test-data/resizing-reaction-arrow-saving.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/resizing-reaction-arrow-saving.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/resizing-reaction-arrow-saving.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/resizing-reaction-arrow-saving.rxn diff --git a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-hcl.rxn b/ketcher-autotests/tests/test-data/Rxn-V3000/benzene-arrow-benzene-reagent-hcl.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-hcl.rxn rename to ketcher-autotests/tests/test-data/Rxn-V3000/benzene-arrow-benzene-reagent-hcl.rxn diff --git a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3-expected.rxn b/ketcher-autotests/tests/test-data/Rxn-V3000/benzene-arrow-benzene-reagent-nh3-expected.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3-expected.rxn rename to ketcher-autotests/tests/test-data/Rxn-V3000/benzene-arrow-benzene-reagent-nh3-expected.rxn diff --git a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3.rxn b/ketcher-autotests/tests/test-data/Rxn-V3000/benzene-arrow-benzene-reagent-nh3.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-nh3.rxn rename to ketcher-autotests/tests/test-data/Rxn-V3000/benzene-arrow-benzene-reagent-nh3.rxn diff --git a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-hclV2000.rxn b/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-hclV2000.rxn deleted file mode 100644 index fe97bca098..0000000000 --- a/ketcher-autotests/tests/test-data/benzene-arrow-benzene-reagent-hclV2000.rxn +++ /dev/null @@ -1,58 +0,0 @@ -$RXN - - - - 1 1 0 -$MOL - - Ketcher 41423 3 32D 1 1.00000 0.00000 0 - - 11 10 0 0 0 0 0 0 0 0999 V2000 - 9.5096 -7.5213 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 11.2399 -7.5209 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 10.3764 -7.0212 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 11.2399 -8.5218 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 9.5096 -8.5263 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 10.3785 -9.0213 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 8.6436 -7.0212 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 12.1061 -7.0213 0.0000 N 0 0 0 0 0 0 0 0 0 0 0 0 - 12.1064 -9.0210 0.0000 S 0 0 0 0 0 0 0 0 0 0 0 0 - 8.6450 -9.0288 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 - 14.6247 -8.5463 0.0000 Cl 0 0 0 0 0 0 0 0 0 0 0 0 - 3 1 2 0 0 0 - 4 2 2 0 0 0 - 1 5 1 0 0 0 - 2 3 1 0 0 0 - 5 6 2 0 0 0 - 6 4 1 0 0 0 - 1 7 1 0 0 0 - 2 8 1 0 0 0 - 4 9 1 0 0 0 - 5 10 1 0 0 0 -M END -$MOL - - Ketcher 41423 3 32D 1 1.00000 0.00000 0 - - 10 10 0 0 0 0 0 0 0 0999 V2000 - 18.9596 -7.4713 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 20.6899 -7.4709 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 19.8264 -6.9712 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 20.6899 -8.4718 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 18.9596 -8.4763 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 19.8285 -8.9713 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 18.0936 -6.9712 0.0000 Br 0 0 0 0 0 0 0 0 0 0 0 0 - 21.5561 -6.9713 0.0000 O 0 0 0 0 0 0 0 0 0 0 0 0 - 18.0950 -8.9788 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 - 21.5564 -8.9710 0.0000 I 0 0 0 0 0 0 0 0 0 0 0 0 - 3 1 2 0 0 0 - 4 2 2 0 0 0 - 1 5 1 0 0 0 - 2 3 1 0 0 0 - 5 6 2 0 0 0 - 6 4 1 0 0 0 - 1 7 1 0 0 0 - 2 8 1 0 0 0 - 5 9 1 0 0 0 - 4 10 1 0 0 0 -M END diff --git a/ketcher-autotests/tests/test-data/sgroups-diff-symyx-expected.json b/ketcher-autotests/tests/test-data/sgroups-diff-symyx-expected.json index 0886832fb9..ecabe71935 100644 --- a/ketcher-autotests/tests/test-data/sgroups-diff-symyx-expected.json +++ b/ketcher-autotests/tests/test-data/sgroups-diff-symyx-expected.json @@ -1 +1 @@ -CCCCCCCCCCCCC.CCCCCCC.CCCCCCC.CCCCCCC.CCCCCCC |Sg:gen:16,17,15:,Sg:n:23,24,22:n:ht| \ No newline at end of file +CCCCCCCCCCCCC.CCCCCCC.CCCCCCC.CCCCCCC.CCCCCCC |Sg:gen:16,17,15:,Sg:n:23,24,22:n:ht,SgD:38,37,36:fgfh:dsfsd::: :| \ No newline at end of file diff --git a/ketcher-autotests/tests/test-data/smiles-alias-pseudoatom-expected.json b/ketcher-autotests/tests/test-data/smiles-alias-pseudoatom-expected.json index e69de29bb2..cadcab3ab7 100644 --- a/ketcher-autotests/tests/test-data/smiles-alias-pseudoatom-expected.json +++ b/ketcher-autotests/tests/test-data/smiles-alias-pseudoatom-expected.json @@ -0,0 +1 @@ +CCCC*CC |$;;alias123;;GH*;;$| \ No newline at end of file diff --git a/ketcher-autotests/tests/test-data/smiles-different-features-expected.json b/ketcher-autotests/tests/test-data/smiles-different-features-expected.json index c38b9c9df1..d8b80b8fdc 100644 --- a/ketcher-autotests/tests/test-data/smiles-different-features-expected.json +++ b/ketcher-autotests/tests/test-data/smiles-different-features-expected.json @@ -1 +1 @@ -S=CC(F)CCCCC[C@@](CCO)/C=C/[C@@](N)CCC[C]C([13C]CC([C+2]CC(CC%91)CC(C)CCC)CCC)CC%92.[*:2]%92.[*:1]%91 |$;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;_R2;_R1$,rb:32:*,u:3| \ No newline at end of file +S=CC(F)CCCCC[C@@](CCO)/C=C/[C@@](N)CCC[C]C([13C]CC([C+2]CC(CC%91)CC(C)CCC)CCC)CC%92.[*:2]%92.[*:1]%91 |$;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;_R2;_R1$,SgD:8:Purity:Purity = 50%::: :,rb:32:*,u:3| \ No newline at end of file diff --git a/ketcher-autotests/tests/utils/canvas/selectSelection.ts b/ketcher-autotests/tests/utils/canvas/selectSelection.ts index 3ea4b178e1..8fea6f4945 100644 --- a/ketcher-autotests/tests/utils/canvas/selectSelection.ts +++ b/ketcher-autotests/tests/utils/canvas/selectSelection.ts @@ -31,8 +31,8 @@ export async function cutAndPaste(page: Page) { await page.getByTestId(TestIdSelectors.RectangleSelection).click(); // to focus in Editor await clickInTheMiddleOfTheScreen(page); - await page.keyboard.press(`${modifier}+KeyA`); - await page.keyboard.press(`${modifier}+KeyX`); + await page.keyboard.press(`${modifier}+KeyA`, { delay: INPUT_DELAY }); + await page.keyboard.press(`${modifier}+KeyX`, { delay: INPUT_DELAY }); await page.keyboard.press(`${modifier}+KeyV`, { delay: INPUT_DELAY }); } @@ -41,8 +41,8 @@ export async function copyAndPaste(page: Page) { await page.getByTestId(TestIdSelectors.RectangleSelection).click(); // to focus in Editor await clickInTheMiddleOfTheScreen(page); - await page.keyboard.press(`${modifier}+KeyA`); - await page.keyboard.press(`${modifier}+KeyC`); + await page.keyboard.press(`${modifier}+KeyA`, { delay: INPUT_DELAY }); + await page.keyboard.press(`${modifier}+KeyC`, { delay: INPUT_DELAY }); await page.keyboard.press(`${modifier}+KeyV`, { delay: INPUT_DELAY }); } diff --git a/ketcher-autotests/tests/utils/files/readFile.ts b/ketcher-autotests/tests/utils/files/readFile.ts index 6c97f306ec..5f9f4607b4 100644 --- a/ketcher-autotests/tests/utils/files/readFile.ts +++ b/ketcher-autotests/tests/utils/files/readFile.ts @@ -135,7 +135,7 @@ export async function saveToFile(filename: string, data: string) { Example of usage: 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); */ +await saveToFile('Rxn-V3000/benzene-arrow-benzene-reagent-hcl.rxn', rxnFile); */ export async function pasteFromClipboard(page: Page, fillValue: string) { await page.getByRole('dialog').getByRole('textbox').fill(fillValue); } diff --git a/packages/ketcher-react/src/script/ui/state/hotkeys.ts b/packages/ketcher-react/src/script/ui/state/hotkeys.ts index 983ea71c0d..fdbfd19328 100644 --- a/packages/ketcher-react/src/script/ui/state/hotkeys.ts +++ b/packages/ketcher-react/src/script/ui/state/hotkeys.ts @@ -73,6 +73,8 @@ const shortcutKeys = [ 'f', 'i', 'b', + '+', + '-', ]; /* HotKeys */