diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml index 5376942e9c..7a74d780fa 100644 --- a/.github/workflows/playwright.yml +++ b/.github/workflows/playwright.yml @@ -19,7 +19,7 @@ env: CI_ENVIRONMENT: true jobs: playwright_tests: - timeout-minutes: 120 + timeout-minutes: 40 runs-on: self-hosted steps: - uses: actions/checkout@v3 diff --git a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts index caa9b495a7..b8fc3a7708 100644 --- a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts +++ b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts @@ -8,9 +8,9 @@ import { DELAY_IN_SECONDS, FILE_TEST_DATA, receiveFileComparisonData, - waitForKetcherInit, waitForSpinnerFinishedWork, clickInTheMiddleOfTheScreen, + waitForIndigoToLoad, } from '@utils'; import { getAtomByIndex } from '@utils/canvas/atoms'; import { @@ -32,7 +32,7 @@ function filteredFile(file: string, filteredIndex: number): string { test.describe('Tests for API setMolecule/getMolecule', () => { test.beforeEach(async ({ page }) => { await page.goto(''); - await waitForKetcherInit(page); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { @@ -176,6 +176,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => { }, ); + // TO DO: split by two tests; use saveToFile function; do not get molv2000 in one line test.fixme( 'Set and Get Molecule containing chiral centers', async ({ page }) => { @@ -195,7 +196,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => { await delay(DELAY_IN_SECONDS.THREE); const molV2000FileExpected = await readFileContents( - 'tests/test-data/test-data-for-chiral-centersv2000.json', + 'tests/test-data/Molfiles-V2000/test-data-for-chiral-centersv2000.mol', ); const molV2000File = await getMolfile(page, 'v2000'); const filteredmolV2000FileExpected = filteredFile( @@ -210,7 +211,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => { expect(filteredmolV2000File).toEqual(filteredmolV2000FileExpected); const molV3000FileExpected = await readFileContents( - 'tests/test-data/test-data-for-chiral-centersv3000.json', + 'tests/test-data/Molfiles-V3000/test-data-for-chiral-centersv3000.mol', ); const molV3000File = await getMolfile(page, 'v3000'); const filteredmolV3000FileExpected = filteredFile( @@ -446,55 +447,50 @@ test.describe('Tests for API setMolecule/getMolecule', () => { await page.getByText('Contract Abbreviation').click(); }); - test.fixme( - 'Add one contracted Functional Group through API ketcher.setMolecule (V3000)', - async ({ page }) => { - /* + test('Add one contracted Functional Group through API ketcher.setMolecule (V3000)', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-13021 Description: one contracted Functional Group added through API ketcher.setMolecule. Functional Group is able to expand. */ - await waitForSpinnerFinishedWork( - page, - async () => - await setMolecule( - page, - FILE_TEST_DATA.oneFunctionalGroupContractedV3000, - ), - ); + await waitForSpinnerFinishedWork( + page, + async () => + await setMolecule( + page, + FILE_TEST_DATA.oneFunctionalGroupContractedV3000, + ), + ); - await takeEditorScreenshot(page); + await takeEditorScreenshot(page); - await page.getByText('Boc').click({ button: 'right' }); - await page.getByText('Expand Abbreviation').click(); - }, - ); + await page.getByText('Boc').click({ button: 'right' }); + await page.getByText('Expand Abbreviation').click(); + }); - test.fixme( - 'Add one expanded Functional Group through API ketcher.setMolecule (V3000)', - async ({ page }) => { - /* + test('Add one expanded Functional Group through API ketcher.setMolecule (V3000)', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-13022 Description: one expanded Functional Group added through API ketcher.setMolecule. Functional Group is able to contract. */ - await waitForSpinnerFinishedWork( - page, - async () => - await setMolecule( - page, - FILE_TEST_DATA.oneFunctionalGroupExpandedV3000, - ), - ); + await waitForSpinnerFinishedWork( + page, + async () => + await setMolecule(page, FILE_TEST_DATA.oneFunctionalGroupExpandedV3000), + ); - await takeEditorScreenshot(page); + await takeEditorScreenshot(page); - // eslint-disable-next-line no-magic-numbers - const point = await getAtomByIndex(page, { label: 'C' }, 3); - await page.mouse.click(point.x, point.y, { button: 'right' }); - await page.getByText('Contract Abbreviation').click(); - }, - ); + // eslint-disable-next-line no-magic-numbers + const point = await getAtomByIndex(page, { label: 'C' }, 3); + await page.mouse.click(point.x, point.y, { button: 'right' }); + await page.getByText('Contract Abbreviation').click(); + }); test('Add Functional Groups expanded/contracted through API ketcher.setMolecule (.ket)', async ({ page, diff --git a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Add-one--1c4c8-Group-through-API-ketcher-setMolecule-V3000-2-chromium-linux.png b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Add-one--1c4c8-Group-through-API-ketcher-setMolecule-V3000-2-chromium-linux.png index 286b31dcc9..a4c79232a1 100644 Binary files a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Add-one--1c4c8-Group-through-API-ketcher-setMolecule-V3000-2-chromium-linux.png and b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Add-one--1c4c8-Group-through-API-ketcher-setMolecule-V3000-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Set-and-Get-Molecule-containing-chiral-centers-1-chromium-linux.png b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Set-and-Get-Molecule-containing-chiral-centers-1-chromium-linux.png index b1be4d27a3..43602df468 100644 Binary files a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Set-and-Get-Molecule-containing-chiral-centers-1-chromium-linux.png and b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Set-and-Get-Molecule-containing-chiral-centers-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Set-and-Get-Molecule-using-V3000-Molfile-format-1-chromium-linux.png b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Set-and-Get-Molecule-using-V3000-Molfile-format-1-chromium-linux.png index dcc4ff7cc8..84790b18a9 100644 Binary files a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Set-and-Get-Molecule-using-V3000-Molfile-format-1-chromium-linux.png and b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts-snapshots/Tests-for-API-setMolecule-getMolecule-Set-and-Get-Molecule-using-V3000-Molfile-format-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts b/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts index ecf386c767..dc38d432c9 100644 --- a/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts +++ b/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts @@ -47,7 +47,7 @@ test.describe('Drawing atom, Benzene ring, Single and Double Bond', () => { await clickOnAtom(page, 'C', 2); }); - test.fixme('single bond tool', async ({ page }) => { + test('single bond tool', async ({ page }) => { /* * Test case: EPMLSOPKET-1371 */ diff --git a/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts-snapshots/Drawing-atom-Benzene-ring-Single-and-Double-Bond-single-bond-tool-1-chromium-linux.png b/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts-snapshots/Drawing-atom-Benzene-ring-Single-and-Double-Bond-single-bond-tool-1-chromium-linux.png index dd2d3cc849..786e47ab33 100644 Binary files a/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts-snapshots/Drawing-atom-Benzene-ring-Single-and-Double-Bond-single-bond-tool-1-chromium-linux.png and b/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts-snapshots/Drawing-atom-Benzene-ring-Single-and-Double-Bond-single-bond-tool-1-chromium-linux.png differ 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 4e3d6208e0..e91ecc8138 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 @@ -6,18 +6,20 @@ import { openFileAndAddToCanvas, takeEditorScreenshot, pasteFromClipboardAndAddToCanvas, + waitForIndigoToLoad, } from '@utils'; test.describe('CDX files', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { await takeEditorScreenshot(page); }); - test.fixme('opening cdx files', async ({ page }) => { + test('opening cdx files', async ({ page }) => { /* Test case: EPMLSOPKET-12514 Description: Open CDX files diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts-snapshots/CDX-files-opening-cdx-files-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-1-chromium-linux.png new file mode 100644 index 0000000000..98690034a2 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-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 2b1b0ab988..44d8eb9727 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 @@ -6,6 +6,7 @@ import { openFileAndAddToCanvas, saveToFile, delay, + waitForIndigoToLoad, } from '@utils'; import { getCml } from '@utils/formats'; @@ -17,6 +18,7 @@ async function openFileAddToCanvasTakeScreenshot(page: Page, fileName: string) { test.describe('CML files', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test('Open and Save files - CML - CML for empty canvas', async ({ page }) => { @@ -78,29 +80,25 @@ test.describe('CML files', () => { expect(cmlFile).toEqual(cmlFileExpected); }); - // flaky - test.fixme( - 'Open and Save file - CML - CML for reaction', - async ({ page }) => { - /** + test('Open and Save file - CML - CML for reaction', async ({ page }) => { + /** * Test case: EPMLSOPKET-1947 Description: Saved cml file with structure is compering with paste reaction from rxn file */ - await openFileAddToCanvasTakeScreenshot(page, 'cml-1947-reaction.rxn'); - // check that structure opened from file is displayed correctly + await openFileAddToCanvasTakeScreenshot(page, 'cml-1947-reaction.rxn'); + // check that structure opened from file is displayed correctly - const expectedFile = await getCml(page); - await saveToFile('cml-1947-reaction-expected.cml', expectedFile); - const { file: cmlFile, fileExpected: cmlFileExpected } = - await receiveFileComparisonData({ - page, - expectedFileName: 'tests/test-data/cml-1947-reaction-expected.cml', - }); - // comparing cml file with golden cml file + const expectedFile = await getCml(page); + await saveToFile('cml-1947-reaction-expected.cml', expectedFile); + const { file: cmlFile, fileExpected: cmlFileExpected } = + await receiveFileComparisonData({ + page, + expectedFileName: 'tests/test-data/cml-1947-reaction-expected.cml', + }); + // comparing cml file with golden cml file - expect(cmlFile).toEqual(cmlFileExpected); - }, - ); + expect(cmlFile).toEqual(cmlFileExpected); + }); test.fixme( 'Open and Save file - CML - CML for R-group and other features', diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts index 96f8b29b56..b9103df661 100644 --- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts +++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts @@ -5,6 +5,7 @@ import { receiveFileComparisonData, openFileAndAddToCanvas, saveToFile, + waitForIndigoToLoad, } from '@utils'; import { getMolfile } from '@utils/formats'; @@ -91,20 +92,20 @@ test('Open and Save file - Open/Save V3000 file with atom and bond properties 2/ expect(molFile).toEqual(molFileExpected); }); -test.fixme( - 'Open and Save file - Open/Save Markush files 1/2 - open', - async ({ page }) => { - /** - * Test case: EPMLSOPKET-1894(1) - * Description: Markush structure is displayed as an RGroup structure. - */ - await page.goto(''); - - await openFileAndAddToCanvas('Markush.mol', page); - // check that structure opened from file is displayed correctly - await takeEditorScreenshot(page); - }, -); +test('Open and Save file - Open/Save Markush files 1/2 - open', async ({ + page, +}) => { + /** + * Test case: EPMLSOPKET-1894(1) + * Description: Markush structure is displayed as an RGroup structure. + */ + await page.goto(''); + await waitForIndigoToLoad(page); + + await openFileAndAddToCanvas('Markush.mol', page); + // check that structure opened from file is displayed correctly + await takeEditorScreenshot(page); +}); test('Open and Save file - Open/Save Markush files 2/2 - save', async ({ page, @@ -251,20 +252,20 @@ test('Open and Save file - Open/Save file with R-Groups 2/2 - save', async ({ expect(molFile).toEqual(molFileExpected); }); -test.fixme( - 'Open and Save file - Open/Save file contains Heteroatoms 1/2 - open', - async ({ page }) => { - /** - * Test case: EPMLSOPKET-1878(1) - * Description: Structure with heteroatoms is opened from mol file correctly - */ - await page.goto(''); - - await openFileAndAddToCanvas('Heteroatoms.mol', page); - // check that structure opened from file is displayed correctly - await takeEditorScreenshot(page); - }, -); +test('Open and Save file - Open/Save file contains Heteroatoms 1/2 - open', async ({ + page, +}) => { + /** + * Test case: EPMLSOPKET-1878(1) + * Description: Structure with heteroatoms is opened from mol file correctly + */ + await page.goto(''); + await waitForIndigoToLoad(page); + + await openFileAndAddToCanvas('Heteroatoms.mol', page); + // check that structure opened from file is displayed correctly + await takeEditorScreenshot(page); +}); test('Open and Save file - Open/Save file contains Heteroatoms 2/2 - save', async ({ page, diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-Markush-files-1-2---open-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-Markush-files-1-2---open-1-chromium-linux.png new file mode 100644 index 0000000000..be81c3bf69 Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-Markush-files-1-2---open-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-Heteroatoms-1-2---open-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-Heteroatoms-1-2---open-1-chromium-linux.png index fc91138d24..fdd7deb8ca 100644 Binary files a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-Heteroatoms-1-2---open-1-chromium-linux.png and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/MOL-Files/mol-files.spec.ts-snapshots/Open-and-Save-file---Open-Save-file-contains-Heteroatoms-1-2---open-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts index 1a17df4d2d..cbf7ebeaa2 100644 --- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts +++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts @@ -10,6 +10,7 @@ import { openFileAndAddToCanvas, TopPanelButton, selectTopPanelButton, + waitForIndigoToLoad, } from '@utils'; const X_OFFSET = 200; @@ -17,6 +18,7 @@ const X_OFFSET = 200; test.describe('open files with different formats', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { @@ -70,7 +72,7 @@ the first one disappears. Couldn't reproduct manually. await clickOnTheCanvas(page, X_OFFSET, 0); }); - test.fixme('Open file - Input .rxn string', async ({ page }) => { + test('Open file - Input .rxn string', async ({ page }) => { /** * Test case: EPMLSOPKET-2860 * Description: Two structures are added to canvas - one opened from clipboard, another from file diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Input-rxn-string-1-chromium-linux.png b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Input-rxn-string-1-chromium-linux.png new file mode 100644 index 0000000000..37f6b2884e Binary files /dev/null and b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Open-File/open-file.spec.ts-snapshots/open-files-with-different-formats-Open-file---Input-rxn-string-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/save-file.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/save-file.spec.ts index a261d10aa1..95fde41d3c 100644 --- a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/save-file.spec.ts +++ b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/save-file.spec.ts @@ -78,12 +78,12 @@ test('Save file - Save *.ket file', async ({ page }) => { ); const expectedFile = await getKet(page); - await saveToFile('Ket/ket-2934-to-compare-expected.ket', expectedFile); + await saveToFile('KET/ket-2934-to-compare-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, - expectedFileName: 'tests/test-data/Ket/ket-2934-to-compare-expected.ket', + expectedFileName: 'tests/test-data/KET/ket-2934-to-compare-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); diff --git a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts index d0171c619b..b4f0e679e4 100644 --- a/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts +++ b/ketcher-autotests/tests/File-Management/Smile-Files/smile-files.spec.ts @@ -11,6 +11,7 @@ import { clickInTheMiddleOfTheScreen, DELAY_IN_SECONDS, waitForLoad, + waitForIndigoToLoad, } from '@utils'; import { getSmiles } from '@utils/formats'; @@ -45,6 +46,7 @@ async function clearCanvasAndPasteSmiles(page: Page, smiles: string) { test.describe('SMILES files', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { @@ -266,52 +268,48 @@ test.describe('SMILES files', () => { await clearCanvasAndPasteSmiles(page, ''); }); - // flaky - test.fixme( - 'SmileString from reaction consists of two or more reaction arrows and structures', - async ({ page }) => { - /* + test('SmileString from reaction consists of two or more reaction arrows and structures', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-8905 Description: Structure is correctly opens from saved files. Keep only first reaction arrow and keep all structures (all intermediate structures should be products and the arrow is replaced by a plus) */ - await openFileAndAddToCanvas('Ket/two-arrows-and-plus.ket', page); - await getAndCompareSmiles( - page, - 'tests/test-data/smiles-two-arrows-and-plus-expected.json', - ); + await openFileAndAddToCanvas('KET/two-arrows-and-plus.ket', page); + await getAndCompareSmiles( + page, + 'tests/test-data/smiles-two-arrows-and-plus-expected.json', + ); - await getPreviewForSmiles(page, 'MDL Rxnfile V2000', 'Daylight SMILES'); - await takeEditorScreenshot(page); + await getPreviewForSmiles(page, 'MDL Rxnfile V2000', 'Daylight SMILES'); + await takeEditorScreenshot(page); - await clearCanvasAndPasteSmiles( - page, - 'C1C=CC=CC=1.O>>C1C=CC(C)=CC=1C.C1C=CC(C)=CC=1C', - ); - }, - ); + await clearCanvasAndPasteSmiles( + page, + 'C1C=CC=CC=1.O>>C1C=CC(C)=CC=1C.C1C=CC(C)=CC=1C', + ); + }); - // flaky - test.fixme( - 'Open Daylight SMILES file with reagent above arrow', - async ({ page }) => { - /* + test('Open Daylight SMILES file with reagent above arrow', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-12965 Description: Structure is not distorted. Reagent NH3 located above reaction arrow. */ - await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', - page, - ); - await getAndCompareSmiles( - page, - 'tests/test-data/smiles-benzene-arrow-benzene-reagent-nh3-expected.json', - ); + await openFileAndAddToCanvas( + 'KET/benzene-arrow-benzene-reagent-nh3.ket', + page, + ); + await getAndCompareSmiles( + page, + 'tests/test-data/smiles-benzene-arrow-benzene-reagent-nh3-expected.json', + ); - await getPreviewForSmiles(page, 'MDL Rxnfile V2000', 'Daylight SMILES'); - await takeEditorScreenshot(page); + await getPreviewForSmiles(page, 'MDL Rxnfile V2000', 'Daylight SMILES'); + await takeEditorScreenshot(page); - await clearCanvasAndPasteSmiles(page, 'C1C=CC=CC=1>N>C1C=CC=CC=1'); - }, - ); + await clearCanvasAndPasteSmiles(page, 'C1C=CC=CC=1>N>C1C=CC=CC=1'); + }); }); 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 69ef7a089b..b37d278787 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 @@ -15,6 +15,8 @@ import { selectAllStructuresOnCanvas, receiveFileComparisonData, saveToFile, + waitForIndigoToLoad, + waitForSpinnerFinishedWork, } from '@utils'; import { getCml, getMolfile, getRxn, getSmiles } from '@utils/formats'; @@ -24,6 +26,7 @@ const CANVAS_CLICK_Y = 200; test.describe('Aromatize/Dearomatize Tool', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { @@ -77,9 +80,13 @@ test.describe('Aromatize/Dearomatize Tool', () => { 'Molfiles-V2000/aromatic-structures.mol', page, ); - await selectTopPanelButton(TopPanelButton.Aromatize, page); + await waitForSpinnerFinishedWork(page, async () => { + await selectTopPanelButton(TopPanelButton.Aromatize, page); + }); await takeEditorScreenshot(page); - await selectTopPanelButton(TopPanelButton.Dearomatize, page); + await waitForSpinnerFinishedWork(page, async () => { + await selectTopPanelButton(TopPanelButton.Dearomatize, page); + }); }, ); @@ -106,60 +113,67 @@ test.describe('Aromatize/Dearomatize Tool', () => { 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 selectTopPanelButton(TopPanelButton.Aromatize, page); - await selectTopPanelButton(TopPanelButton.Dearomatize, 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.fixme( - '(Copy/Paste) Manipulations with cyclic structures with a circle inside the cycle', - async ({ page }) => { - /* + test('(Copy/Paste) Manipulations with cyclic structures with a circle inside the cycle', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1872 Description: The structures are pasted. The structures are rendered with a circle inside the cycle during any manipulations. */ - // test is working but structures moves. will fixes after fixing bug with canvas movement after copy/paste - await openFileAndAddToCanvas('cycles-with-aromatic-bonds.mol', page); - await copyAndPaste(page); - await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); + // test is working but structures moves. will fixes after fixing bug with canvas movement after copy/paste + await openFileAndAddToCanvas('cycles-with-aromatic-bonds.mol', page); + await copyAndPaste(page); + await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); + await waitForSpinnerFinishedWork(page, async () => { await selectTopPanelButton(TopPanelButton.Aromatize, page); - }, - ); + }); + }); - test.fixme( - '(Cut/Paste) Manipulations with cyclic structures with a circle inside the cycle', - async ({ page }) => { - /* + test('(Cut/Paste) Manipulations with cyclic structures with a circle inside the cycle', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1872 Description: The structures are pasted. The structures are rendered with a circle inside the cycle during any manipulations. */ - await openFileAndAddToCanvas('cycles-with-aromatic-bonds.mol', page); - await cutAndPaste(page); - await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); + await openFileAndAddToCanvas('cycles-with-aromatic-bonds.mol', page); + await cutAndPaste(page); + await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); + await waitForSpinnerFinishedWork(page, async () => { await selectTopPanelButton(TopPanelButton.Aromatize, page); - }, - ); + }); + }); - test.fixme( - '(Add Atom) Manipulations with cyclic structures with a circle inside the cycle', - async ({ page }) => { - /* + test('(Add Atom) Manipulations with cyclic structures with a circle inside the cycle', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1872 Description: Atom added to the structure. The structures are rendered with a circle inside the cycle during any manipulations. */ - await selectRing(RingButton.Benzene, page); - await clickInTheMiddleOfTheScreen(page); + await selectRing(RingButton.Benzene, page); + await clickInTheMiddleOfTheScreen(page); + await waitForSpinnerFinishedWork(page, async () => { await selectTopPanelButton(TopPanelButton.Aromatize, page); - await selectAllStructuresOnCanvas(page); - await selectAtomInToolbar(AtomButton.Nitrogen, page); - }, - ); + }); + await selectAllStructuresOnCanvas(page); + await selectAtomInToolbar(AtomButton.Nitrogen, page); + }); test('(MolV2000) Save 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-Add-Atom-Manipula-e6120-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-Add-Atom-Manipula-e6120-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png index d1caab10a9..35066e7217 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Add-Atom-Manipula-e6120-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-Add-Atom-Manipula-e6120-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-Copy-Paste-Manipu-ff58c-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-Copy-Paste-Manipu-ff58c-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png index 5491dfa9cc..d7c2330373 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Copy-Paste-Manipu-ff58c-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-Copy-Paste-Manipu-ff58c-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-Cut-Paste-Manipul-880b8-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-Cut-Paste-Manipul-880b8-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png index bbfb2857cc..0741d7f9d8 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts-snapshots/Aromatize-Dearomatize-Tool-Cut-Paste-Manipul-880b8-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-Cut-Paste-Manipul-880b8-lic-structures-with-a-circle-inside-the-cycle-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts index 0327399f2f..ee5e871504 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts @@ -22,6 +22,7 @@ import { saveToFile, BondTool, selectNestedTool, + waitForIndigoToLoad, } from '@utils'; import { getAtomByIndex } from '@utils/canvas/atoms'; import { getBondByIndex } from '@utils/canvas/bonds'; @@ -31,6 +32,7 @@ import { getKet, getMolfile } from '@utils/formats'; test.describe('Indigo Tools - Calculate CIP Tool', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { @@ -44,7 +46,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { Test case: EPMLSOPKET-1886 Description: The structure isn`t changed. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectTopPanelButton(TopPanelButton.Calculate, page); }); @@ -71,59 +73,56 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { await resetCurrentTool(page); }); - test.fixme( - 'Layout/Undo with structure that contain stereo labels', - async ({ page }) => { - /* + test('Layout/Undo with structure that contain stereo labels', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1900 Description: Stereo labels appear near stereobonds after 'Calculate CIP' action. Stereo labels disappear after 'Layout' action. 'Undo' action leads to the previous structure with stereo labels. */ - // will work after bugfix in 2.13-rc.3 bug#3025 - await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); - await selectTopPanelButton(TopPanelButton.Calculate, page); - await selectTopPanelButton(TopPanelButton.Layout, page); + // will work after bugfix in 2.13-rc.3 bug#3025 + await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); + await selectTopPanelButton(TopPanelButton.Calculate, page); + await selectTopPanelButton(TopPanelButton.Layout, page); - await takeEditorScreenshot(page); + await takeEditorScreenshot(page); - await selectTopPanelButton(TopPanelButton.Undo, page); - }, - ); + await selectTopPanelButton(TopPanelButton.Undo, page); + }); - test.fixme( - 'Copy/Paste of structure that contain stereo labels', - async ({ page }) => { - /* + test('Copy/Paste of structure that contain stereo labels', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1896 Description: The structure is copied. Stereo labels don't disappear after paste of the structure on the canvas. */ - const x = 300; - const y = 300; - await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); - await selectTopPanelButton(TopPanelButton.Calculate, page); - await copyAndPaste(page); - await page.mouse.click(x, y); - }, - ); + const x = 300; + const y = 300; + await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); + await selectTopPanelButton(TopPanelButton.Calculate, page); + await copyAndPaste(page); + await page.mouse.click(x, y); + }); - test.fixme( - 'Cut/Paste of structure that contain stereo labels', - async ({ page }) => { - /* + test('Cut/Paste of structure that contain stereo labels', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1898 Description: The structure is cut. Stereo labels don't disappear after paste of the structure on the canvas. */ - const x = 300; - const y = 300; - await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); - await selectTopPanelButton(TopPanelButton.Calculate, page); - await cutAndPaste(page); - await page.mouse.click(x, y); - }, - ); + const x = 300; + const y = 300; + await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); + await selectTopPanelButton(TopPanelButton.Calculate, page); + await cutAndPaste(page); + await page.mouse.click(x, y); + }); test('Operation with structure including stereo properties (E/Z labels)', async ({ page, @@ -356,7 +355,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); const expectedFile = await getKet(page); await saveToFile( - 'Ket/structure-with-stereo-bonds-expected.ket', + 'KET/structure-with-stereo-bonds-expected.ket', expectedFile, ); await selectTopPanelButton(TopPanelButton.Calculate, page); @@ -364,7 +363,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/structure-with-stereo-bonds-expected.ket', + 'tests/test-data/KET/structure-with-stereo-bonds-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -397,33 +396,31 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => { expect(molFile).toEqual(molFileExpected); }); - test.fixme( - 'Save as .mol V3000 file structure with stereo labels', - async ({ page }) => { - /* + test('Save as .mol V3000 file structure with stereo labels', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-1911 Description: The file is saved as .mol V3000 file. */ - await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); - const expectedFile = await getMolfile(page, 'v3000'); - await saveToFile( - 'structure-with-stereo-bonds-expectedV3000.mol', - expectedFile, - ); - await selectTopPanelButton(TopPanelButton.Calculate, page); - const METADATA_STRING_INDEX = [1]; - const { file: molFile, fileExpected: molFileExpected } = - await receiveFileComparisonData({ - page, - metaDataIndexes: METADATA_STRING_INDEX, - expectedFileName: - 'tests/test-data/structure-with-stereo-bonds-expectedV3000.mol', - fileFormat: 'v3000', - }); - - expect(molFile).toEqual(molFileExpected); - }, - ); + await openFileAndAddToCanvas('structure-with-stereo-bonds.mol', page); + const expectedFile = await getMolfile(page, 'v3000'); + await saveToFile( + 'structure-with-stereo-bonds-expectedV3000.mol', + expectedFile, + ); + const METADATA_STRING_INDEX = [1]; + const { file: molFile, fileExpected: molFileExpected } = + await receiveFileComparisonData({ + page, + metaDataIndexes: METADATA_STRING_INDEX, + expectedFileName: + 'tests/test-data/structure-with-stereo-bonds-expectedV3000.mol', + fileFormat: 'v3000', + }); + + expect(molFile).toEqual(molFileExpected); + }); test('Save as .smi file structure with stereo labels', async ({ page }) => { /* diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Copy-Paste-of-structure-that-contain-stereo-labels-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Copy-Paste-of-structure-that-contain-stereo-labels-1-chromium-linux.png new file mode 100644 index 0000000000..fb44aa1ea7 Binary files /dev/null and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Copy-Paste-of-structure-that-contain-stereo-labels-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Cut-Paste-of-structure-that-contain-stereo-labels-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Cut-Paste-of-structure-that-contain-stereo-labels-1-chromium-linux.png new file mode 100644 index 0000000000..2757fd85e9 Binary files /dev/null and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Cut-Paste-of-structure-that-contain-stereo-labels-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-1-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-1-chromium-linux.png index 04477e6749..e8a45deed6 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-1-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png index c82adb192e..9fc3266f55 100644 Binary files a/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-2-chromium-linux.png and b/ketcher-autotests/tests/Indigo-Tools/Calculate-CIP-Tool/calculate-cip-tool.spec.ts-snapshots/Indigo-Tools---Calculate-CIP-Tool-Layout-Undo-with-structure-that-contain-stereo-labels-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 b6a7544654..ebc523723d 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Calculated-Values-Tool/calculated-values.spec.ts @@ -32,7 +32,7 @@ test.describe('Calculated Values Tools', () => { Description: The 'Calculated Values' modal window is opened, the 'Chemical Formula' field contains 'C7H16' value. */ - await openFileAndAddToCanvas('Ket/calculated-values-chain.ket', page); + await openFileAndAddToCanvas('KET/calculated-values-chain.ket', page); await selectTopPanelButton(TopPanelButton.Calculated, page); }); @@ -615,7 +615,7 @@ test.describe('Calculated Values Tools', () => { */ const xDelta = 500; const yDelta = 800; - await openFileAndAddToCanvas('Ket/reaction-arrow.ket', page); + await openFileAndAddToCanvas('KET/reaction-arrow.ket', page); const { x, y } = await getCoordinatesOfTheMiddleOfTheScreen(page); await dragMouseTo(x - xDelta, y + yDelta, page); await selectTopPanelButton(TopPanelButton.Calculated, page); diff --git a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts index 992b073f7b..98715c1f1a 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Clean-Tools/clean-tools.spec.ts @@ -224,7 +224,7 @@ test.describe('Indigo Tools - Clean Tools', () => { The Clean Up action is applied correctly and simultaneously to the whole structure with stereolabels. */ - await openFileAndAddToCanvas('Ket/stereolabels.ket', page); + await openFileAndAddToCanvas('KET/stereolabels.ket', page); await selectTopPanelButton(TopPanelButton.Clean, page); await delay(DELAY_IN_SECONDS.SEVEN); diff --git a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts index 375a20ad5f..97b929189b 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Enhanced-Stereochemistry/enhanced-stereochemistry.spec.ts @@ -202,7 +202,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { - the selected stereocenters have different stereo marks. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectLeftPanelButton(LeftPanelButton.Stereochemistry, page); @@ -254,15 +254,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('Ket/stereo-and-structure.ket', page); + await openFileAndAddToCanvas('KET/stereo-and-structure.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/stereo-and-structure-expected.ket', expectedFile); + await saveToFile('KET/stereo-and-structure-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/stereo-and-structure-expected.ket', + 'tests/test-data/KET/stereo-and-structure-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -281,15 +281,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('Ket/stereo-or-structure.ket', page); + await openFileAndAddToCanvas('KET/stereo-or-structure.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/stereo-or-structure-expected.ket', expectedFile); + await saveToFile('KET/stereo-or-structure-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/stereo-or-structure-expected.ket', + 'tests/test-data/KET/stereo-or-structure-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -308,15 +308,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('Ket/stereo-mixed-structure.ket', page); + await openFileAndAddToCanvas('KET/stereo-mixed-structure.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/stereo-mixed-structure-expected.ket', expectedFile); + await saveToFile('KET/stereo-mixed-structure-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/stereo-mixed-structure-expected.ket', + 'tests/test-data/KET/stereo-mixed-structure-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -337,15 +337,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('mixed-and-stereomarks.ket', page); + await openFileAndAddToCanvas('KET/mixed-and-stereomarks.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/mixed-and-stereomarks-expected.ket', expectedFile); + await saveToFile('KET/mixed-and-stereomarks-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/mixed-and-stereomarks-expected.ket', + 'tests/test-data/KET/mixed-and-stereomarks-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -366,15 +366,15 @@ test.describe('Enhanced Stereochemistry Tool', () => { All enhanced stereochemistry features are present after opening. It's possible to edit the stereo marks assignment after opening the saved file. */ - await openFileAndAddToCanvas('Ket/mixed-or-stereomarks.ket', page); + await openFileAndAddToCanvas('KET/mixed-or-stereomarks.ket', page); const expectedFile = await getKet(page); - await saveToFile('Ket/mixed-or-stereomarks-expected.ket', expectedFile); + await saveToFile('KET/mixed-or-stereomarks-expected.ket', expectedFile); const { fileExpected: ketFileExpected, file: ketFile } = await receiveFileComparisonData({ page, expectedFileName: - 'tests/test-data/Ket/mixed-or-stereomarks-expected.ket', + 'tests/test-data/KET/mixed-or-stereomarks-expected.ket', }); expect(ketFile).toEqual(ketFileExpected); @@ -392,7 +392,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: The '&1' and 'or1' and 'abs' stereo marks appear next to the selected stereocenter. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectLabelDisplayAtStereogenicCenters(page, 'Classic'); @@ -404,7 +404,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: The '&1' and 'or1' and 'abs' stereo marks appear next to the selected stereocenter. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectLabelDisplayAtStereogenicCenters(page, 'On'); @@ -416,7 +416,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: Only stereo flag displays near the structure. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectLabelDisplayAtStereogenicCenters(page, 'Off'); @@ -428,7 +428,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: When 'Off' is selected - Stereobonds and stereo labels are displayed in black. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectColorOfStereogenicCenters(page, 'Off'); @@ -440,7 +440,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: When 'Labels and Bonds' is selected - Stereobonds and stereo labels are displayed in color. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectColorOfStereogenicCenters(page, 'Labels and Bonds'); @@ -453,7 +453,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { and stereo labels are displayed in black. */ await openFileAndAddToCanvas( - 'Ket/different-marks-stereostructure.ket', + 'KET/different-marks-stereostructure.ket', page, ); await selectColorOfStereogenicCenters(page, 'Bonds Only'); @@ -559,7 +559,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { 'Add to OR [ ] Group' setting becomes available when at least one OR group has been created on the canvas. */ - await openFileAndAddToCanvas('Ket/mixed-and-or-structure.ket', page); + await openFileAndAddToCanvas('KET/mixed-and-or-structure.ket', page); await selectLeftPanelButton(LeftPanelButton.Stereochemistry, page); }); @@ -569,7 +569,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: Labels (&) are colored and color intensity is decreasing with the number. */ await openFileAndAddToCanvas( - 'Ket/mixed-with-eight-stereocenters.ket', + 'KET/mixed-with-eight-stereocenters.ket', page, ); await takeEditorScreenshot(page); @@ -592,7 +592,7 @@ test.describe('Enhanced Stereochemistry Tool', () => { Description: Stereo flag - Mixed2 */ await editMixedFlagText(page, 'Mixed2'); - await openFileAndAddToCanvas('Ket/mixed-and-stereomarks.ket', page); + await openFileAndAddToCanvas('KET/mixed-and-stereomarks.ket', page); }); test('No overlapping of Stereo flag and structure', async ({ page }) => { diff --git a/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts index 582c2ea07a..ba8490a383 100644 --- a/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts +++ b/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts @@ -37,7 +37,7 @@ test.describe('Indigo Tools - Layout', () => { page, }) => { // Related Github issue: https://github.com/epam/ketcher/issues/3025 - const structureWithStereoFlags = 'Ket/structure-with-stereo-flags.ket'; + const structureWithStereoFlags = 'KET/structure-with-stereo-flags.ket'; await openFileWithShift(structureWithStereoFlags, page); await selectTopPanelButton(TopPanelButton.Layout, page); await selectTopPanelButton(TopPanelButton.Layout, page); diff --git a/ketcher-autotests/tests/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 1114d3bbf5..8b9259be6b 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 @@ -62,7 +62,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { * Test case: EPMLSOPKET-1808 * Description: UI dialog */ - await openFileAndAddToCanvas('rxn/reaction-2.rxn', page); + await openFileAndAddToCanvas('Rxn-V2000/reaction-2.rxn', page); await selectNestedTool(page, ReactionMappingTool.AUTOMAP); await takeEditorScreenshot(page); await pressButton(page, 'Discard'); @@ -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/reaction-3.rxn', page); + await openFileAndAddToCanvas('Rxn-V3000/reaction-3.rxn', page); await applyAutoMapMode(page, mode); await selectTopPanelButton(TopPanelButton.Undo, page); await takeEditorScreenshot(page); @@ -155,7 +155,7 @@ test.describe('Verifying buttons on reaction am tool dropdown', () => { * Test cases: EPMLSOPKET-1821 * Description: Clear mode */ - await openFileAndAddToCanvas('Rxn/reaction-3.rxn', page); + await openFileAndAddToCanvas('Rxn-V3000/reaction-3.rxn', page); await applyAutoMapMode(page, 'Alter'); await applyAutoMapMode(page, 'Clear'); await mapTwoAtoms( 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 index 599cb404d6..8e701aeb80 100644 --- 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 @@ -18,6 +18,7 @@ import { selectTopPanelButton, LeftPanelButton, selectLeftPanelButton, + waitForIndigoToLoad, } from '@utils'; async function openRGroupModalForTopAtom(page: Page) { @@ -53,6 +54,7 @@ async function clickModalButton(page: Page, button: 'Apply' | 'Cancel') { test.describe('Open Ketcher', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { @@ -220,14 +222,14 @@ test.describe('Open Ketcher', () => { await page.keyboard.press('Delete'); }); - test.fixme('Delete R-Group member', async ({ page }) => { + 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('R8').click(); + await page.getByText(rGroupFromFile).click(); await page.keyboard.press('Delete'); await takeEditorScreenshot(page); @@ -235,7 +237,7 @@ test.describe('Open Ketcher', () => { await delay(DELAY_IN_SECONDS.THREE); await selectLeftPanelButton(LeftPanelButton.Erase, page); - await selectRGroup(page, rGroupFromFile); + await page.getByText(rGroupFromFile).click(); await takeEditorScreenshot(page); await selectTopPanelButton(TopPanelButton.Undo, page); 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 new file mode 100644 index 0000000000..f06b6b21a7 Binary files /dev/null and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-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-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 new file mode 100644 index 0000000000..9dddcaab29 Binary files /dev/null and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-2-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/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-3-chromium-linux.png new file mode 100644 index 0000000000..b06752df37 Binary files /dev/null and b/ketcher-autotests/tests/R-group-tool/r-group-fragment-tool.spec.ts-snapshots/Open-Ketcher-Delete-R-Group-member-3-chromium-linux.png 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 3fb1a4626a..73e4e13abe 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 @@ -176,7 +176,7 @@ test.describe('Plus and Arrows tools ', () => { */ let point: Point; test.beforeEach(async ({ page }) => { - await openFileAndAddToCanvas('Rxn/reaction-3.rxn', page); + await openFileAndAddToCanvas('Rxn-V3000/reaction-3.rxn', page); await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); point = await getCoordinatesOfTheMiddleOfTheScreen(page); }); @@ -244,7 +244,7 @@ test.describe('Plus and Arrows tools ', () => { */ let point: Point; test.beforeEach(async ({ page }) => { - await openFileAndAddToCanvas('Rxn/reaction-3.rxn', page); + await openFileAndAddToCanvas('Rxn-V3000/reaction-3.rxn', page); await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); point = await getCoordinatesOfTheMiddleOfTheScreen(page); }); @@ -444,7 +444,7 @@ test.describe('Plus and Arrows tools ', () => { test('open file', async ({ page }) => { await openFileAndAddToCanvas( - 'Ket/default-reaction-arrow-tool-saving.ket', + 'KET/default-reaction-arrow-tool-saving.ket', page, ); }); @@ -467,7 +467,7 @@ test.describe('Plus and Arrows tools ', () => { test('open file', async ({ page }) => { await openFileAndAddToCanvas( - 'Ket/non-default-reaction-arrow-tool-saving.ket', + 'KET/non-default-reaction-arrow-tool-saving.ket', page, ); }); @@ -563,7 +563,10 @@ test.describe('Plus and Arrows tools ', () => { await openFileAndAddToCanvas(`resizing-reaction-arrow-saving.rxn`, page); await takeEditorScreenshot(page); await selectTopPanelButton(TopPanelButton.Clear, page); - await openFileAndAddToCanvas(`resizing-reaction-arrow-saving.ket`, page); + await openFileAndAddToCanvas( + `KET/resizing-reaction-arrow-saving.ket`, + page, + ); }); }); diff --git a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts index fc16980b25..d2f2caf389 100644 --- a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts +++ b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts @@ -54,7 +54,7 @@ test.describe('Reagents CDXML format', () => { Description: System detect molecule NH3 above arrow as reagent and write reagent in 'CDXML' format in "Preview" tab */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -78,7 +78,7 @@ test.describe('Reagents CDXML format', () => { Description: System detect molecule HCl below arrow as reagent and write reagent in 'CDXML' format in "Preview" tab */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); await delay(DELAY_IN_SECONDS.THREE); @@ -103,7 +103,7 @@ test.describe('Reagents CDXML format', () => { Description: System detect text NH3 as reagent and write reagent in 'CDXML' format in "Preview" tab */ await openFileAndAddToCanvas( - 'Ket/reagent-nh3-text-above-arrow.ket', + 'KET/reagent-nh3-text-above-arrow.ket', page, ); await delay(DELAY_IN_SECONDS.THREE); @@ -128,7 +128,7 @@ test.describe('Reagents CDXML format', () => { Description: System detect text HCl below arrow as reagent and write reagent in 'CDXML' format in "Preview" tab */ await openFileAndAddToCanvas( - 'Ket/reagent-hcl-text-below-arrow.ket', + 'KET/reagent-hcl-text-below-arrow.ket', page, ); await delay(DELAY_IN_SECONDS.THREE); @@ -150,7 +150,7 @@ test.describe('Reagents CDXML format', () => { Description: File saved in format (e.g. "ketcher.cdxml") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); await delay(DELAY_IN_SECONDS.THREE); @@ -183,7 +183,7 @@ test.describe('Reagents CDXML format', () => { Description: File opens with the reagent NH3 on top of the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); }); @@ -194,7 +194,7 @@ test.describe('Reagents CDXML format', () => { Description: File opens with the reagent HCl below the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); }); diff --git a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts-snapshots/Reagents-CDXML-format-Detection-molecule-as-re-054cd-nformation-in-CDXML-format-in-Preview-tab-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts-snapshots/Reagents-CDXML-format-Detection-molecule-as-re-054cd-nformation-in-CDXML-format-in-Preview-tab-1-chromium-linux.png index 6704f97414..dfcc56bfb0 100644 Binary files a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts-snapshots/Reagents-CDXML-format-Detection-molecule-as-re-054cd-nformation-in-CDXML-format-in-Preview-tab-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts-snapshots/Reagents-CDXML-format-Detection-molecule-as-re-054cd-nformation-in-CDXML-format-in-Preview-tab-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts-snapshots/Reagents-CDXML-format-Detection-text-as-reagen-57da2-nformation-in-CDXML-format-in-Preview-tab-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts-snapshots/Reagents-CDXML-format-Detection-text-as-reagen-57da2-nformation-in-CDXML-format-in-Preview-tab-1-chromium-linux.png index 24fe0c2daf..b1947653f4 100644 Binary files a/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts-snapshots/Reagents-CDXML-format-Detection-text-as-reagen-57da2-nformation-in-CDXML-format-in-Preview-tab-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/CDXML-Format/reagents-cdxml-format.spec.ts-snapshots/Reagents-CDXML-format-Detection-text-as-reagen-57da2-nformation-in-CDXML-format-in-Preview-tab-1-chromium-linux.png differ 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 70f05b18fb..679ce1c0f7 100644 --- a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts +++ b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts @@ -11,6 +11,7 @@ import { FILE_TEST_DATA, saveToFile, waitForLoad, + waitForIndigoToLoad, } from '@utils'; import { getRxn } from '@utils/formats'; @@ -61,7 +62,7 @@ test.describe('Reagents RXN format', () => { Description: Files are compared for reagent presence */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); const expectedFile = await getRxn(page, 'v2000'); @@ -95,7 +96,7 @@ test.describe('Reagents RXN format', () => { Description: Files are compared for reagent presence */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); const expectedFile = await getRxn(page, 'v3000'); @@ -127,7 +128,7 @@ test.describe('Reagents RXN format', () => { Description: File saved in format (e.g. "ketcher.rxn") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); const expectedFile = await getRxn(page, 'v2000'); @@ -161,7 +162,7 @@ test.describe('Reagents RXN format', () => { Description: File saved in format (e.g. "ketcher.rxn") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); const expectedFile = await getRxn(page, 'v3000'); @@ -194,28 +195,27 @@ test.describe('Reagents RXN format', () => { test.describe('Reagents RXN format', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { await takeEditorScreenshot(page); }); - test.fixme('Open from file in "RXN V2000" format', async ({ page }) => { + test('Open from file in "RXN V2000" format', async ({ page }) => { /* Test case: EPMLSOPKET-4679 Description: Reagent 'NH3' above the reaction arrow */ - // will fix when fixed Indigo bug #1205 await openFileAndAddToCanvas('mdl-rxnfile-v2000-expected.rxn', page); await clickInTheMiddleOfTheScreen(page); }); - test.fixme('Open from file in "RXN V3000" format', async ({ page }) => { + test('Open from file in "RXN V3000" format', async ({ page }) => { /* Test case: EPMLSOPKET-4680 Description: Reagent 'NH3' above the reaction arrow */ - // will fix when fixed Indigo bug #1205 await openFileAndAddToCanvas('mdl-rxnfile-v3000-expected.rxn', page); await clickInTheMiddleOfTheScreen(page); }); @@ -232,12 +232,11 @@ test.describe('Reagents RXN format', () => { await clickInTheMiddleOfTheScreen(page); }); - test.fixme('Paste from clipboard in "RXN V3000" format', async ({ page }) => { + test('Paste from clipboard in "RXN V3000" format', async ({ page }) => { /* Test case: EPMLSOPKET-4678 Description: Reagent 'Cl' displays below reaction arrow */ - // will fix when fixed Indigo bug #1205 await pasteFromClipboard( page, FILE_TEST_DATA.benzeneArrowBenzeneReagentHclV3000, diff --git a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Open-from-file-in-RXN-V2000-format-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Open-from-file-in-RXN-V2000-format-1-chromium-linux.png index 55ce68147d..9c51ce3305 100644 Binary files a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Open-from-file-in-RXN-V2000-format-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Open-from-file-in-RXN-V2000-format-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Open-from-file-in-RXN-V3000-format-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Open-from-file-in-RXN-V3000-format-1-chromium-linux.png index 5502acc3e3..e31b6d1870 100644 Binary files a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Open-from-file-in-RXN-V3000-format-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Open-from-file-in-RXN-V3000-format-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Paste-from-clipboard-in-RXN-V3000-format-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Paste-from-clipboard-in-RXN-V3000-format-1-chromium-linux.png index 7fc2e10ea1..5d9256eb37 100644 Binary files a/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Paste-from-clipboard-in-RXN-V3000-format-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/RXN-Format/reagents-rxn-format.spec.ts-snapshots/Reagents-RXN-format-Paste-from-clipboard-in-RXN-V3000-format-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts b/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts index 3df9e85d68..c55a34398c 100644 --- a/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts +++ b/ketcher-autotests/tests/Reagents/SMARTS-Format/reagents-smarts-format.spec.ts @@ -44,7 +44,7 @@ test.describe('Reagents SMARTS format', () => { format in "Preview" tab (e.g. [#6]-1=[#6]-[#6]=[#6]-[#6]=[#6]-1>[#7]>[#6]-1=[#6]-[#6]=[#6]-[#6]=[#6]-1) */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -69,7 +69,7 @@ test.describe('Reagents SMARTS format', () => { ) */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); @@ -129,7 +129,7 @@ test.describe('Reagents SMARTS format', () => { Description: File saved in format (e.g. "ketcher.smarts") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); diff --git a/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts b/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts index e1cce9c041..6f1cdaaf4f 100644 --- a/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts +++ b/ketcher-autotests/tests/Reagents/SMILES-Format/reagents-smiles-format.spec.ts @@ -61,7 +61,7 @@ test.describe('Reagents SMILES format', () => { where specifying reactant, agent and product molecule(s) separated by the "greater-than" symbol ('>'). */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -84,7 +84,10 @@ test.describe('Reagents SMILES format', () => { format in "Preview" tab (e.g. C1(C)C(O)=CC(S)=C(N)C=1>Cl>C1(Br)C(C)=CC(I)=C(O)C=1 where specifying reactant, agent and product molecule(s) separated by the "greater-than" symbol ('>'). */ - await openFileAndAddToCanvas('benzene-arrow-benzene-reagent-hcl.ket', page); + await openFileAndAddToCanvas( + 'KET/benzene-arrow-benzene-reagent-hcl.ket', + page, + ); const smiFileExpected = await readFileContents( 'tests/test-data/daylight-smiles-below-expected.smi', @@ -106,7 +109,7 @@ test.describe('Reagents SMILES format', () => { where specifying reactant, agent and product molecule(s) separated by the "greater-than" symbol ('>'). */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -123,7 +126,10 @@ test.describe('Reagents SMILES format', () => { format in "Preview" tab (e.g. C1(C)C(O)=CC(S)=C(N)C=1>Cl>C1(Br)C(C)=CC(I)=C(O)C=1 where specifying reactant, agent and product molecule(s) separated by the "greater-than" symbol ('>'). */ - await openFileAndAddToCanvas('benzene-arrow-benzene-reagent-hcl.ket', page); + await openFileAndAddToCanvas( + 'KET/benzene-arrow-benzene-reagent-hcl.ket', + page, + ); await getPreviewForSmiles(page, 'MDL Rxnfile V2000', 'Extended SMILES'); }); @@ -189,7 +195,7 @@ test.describe('Reagents SMILES format', () => { Description: File saved in format (e.g. "ketcher.smi") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -208,7 +214,7 @@ test.describe('Reagents SMILES format', () => { Description: File saved in format (e.g. "ketcher.cxsmi") */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); diff --git a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts index 8729d00963..4cbd81accb 100644 --- a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts +++ b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts @@ -6,30 +6,26 @@ import { openFileAndAddToCanvas, delay, DELAY_IN_SECONDS, + waitForIndigoToLoad, } from '@utils'; test.describe('Reagents molecule above arrow', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { await takeEditorScreenshot(page); }); - test.fixme( - 'Open File RXN v3000 with reagent NH3 above arrow', - async ({ page }) => { - /* + test('Open File RXN v3000 with reagent NH3 above arrow', async ({ page }) => { + /* 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('benzene-arrow-benzene-reagent-nh3.rxn', page); + }); test('Open File CDXML with reagent NH3 above arrow', async ({ page }) => { /* @@ -42,13 +38,13 @@ test.describe('Reagents molecule above arrow', () => { ); }); - test.fixme('Save SVG with reagent NH3 above arrow', async ({ page }) => { + test('Save SVG with reagent NH3 above arrow', async ({ page }) => { /* Test case: EPMLSOPKET-4701 Description: File is shown in the preview with the NH3 reagent above the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); @@ -58,13 +54,13 @@ test.describe('Reagents molecule above arrow', () => { await page.getByRole('option', { name: 'SVG Document' }).click(); }); - test.fixme('Save PNG with reagent NH3 above arrow', async ({ page }) => { + test('Save PNG with reagent NH3 above arrow', async ({ page }) => { /* Test case: EPMLSOPKET-4698 Description: File is shown in the preview with the NH3 reagent above the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-nh3.ket', + 'KET/benzene-arrow-benzene-reagent-nh3.ket', page, ); await selectTopPanelButton(TopPanelButton.Save, page); diff --git a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts-snapshots/Reagents-molecule-above-arrow-Open-File-RXN-v3000-with-reagent-NH3-above-arrow-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts-snapshots/Reagents-molecule-above-arrow-Open-File-RXN-v3000-with-reagent-NH3-above-arrow-1-chromium-linux.png index e8f5616e43..a771cdec96 100644 Binary files a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts-snapshots/Reagents-molecule-above-arrow-Open-File-RXN-v3000-with-reagent-NH3-above-arrow-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts-snapshots/Reagents-molecule-above-arrow-Open-File-RXN-v3000-with-reagent-NH3-above-arrow-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts-snapshots/Reagents-molecule-above-arrow-Save-PNG-with-reagent-NH3-above-arrow-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts-snapshots/Reagents-molecule-above-arrow-Save-PNG-with-reagent-NH3-above-arrow-1-chromium-linux.png index cc8e8a7297..d52793120d 100644 Binary files a/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts-snapshots/Reagents-molecule-above-arrow-Save-PNG-with-reagent-NH3-above-arrow-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/reagents-molecule-above-arrow.spec.ts-snapshots/Reagents-molecule-above-arrow-Save-PNG-with-reagent-NH3-above-arrow-1-chromium-linux.png differ 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 0076df2f96..567831ff37 100644 --- a/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts +++ b/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts @@ -4,55 +4,45 @@ import { TopPanelButton, takeEditorScreenshot, openFileAndAddToCanvas, + waitForIndigoToLoad, } from '@utils'; test.describe('Reagents molecule below arrow', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { await takeEditorScreenshot(page); }); - // TODO flaky - test.fixme( - 'Open File RXN v3000 with reagent HCl below arrow', - async ({ page }) => { - /* + test('Open File RXN v3000 with reagent HCl below arrow', async ({ page }) => { + /* 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('benzene-arrow-benzene-reagent-hcl.rxn', page); + }); - // TODO flaky - test.fixme( - 'Open File CDXML with reagent HCl below arrow', - async ({ page }) => { - /* + test('Open File CDXML with reagent HCl below arrow', async ({ page }) => { + /* Test case: EPMLSOPKET-4723 Description: File opens with the reagent HCl below the arrow */ - await openFileAndAddToCanvas( - 'benzene-arrow-benzene-reagent-hcl.cdxml', - page, - ); - }, - ); + await openFileAndAddToCanvas( + 'benzene-arrow-benzene-reagent-hcl.cdxml', + page, + ); + }); - // TODO flaky - test.fixme('Save SVG with reagent HCl below arrow', async ({ page }) => { + test('Save SVG with reagent HCl below arrow', async ({ page }) => { /* Test case: EPMLSOPKET-4701 Description: File is shown in the preview with the HCl reagent below the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); await selectTopPanelButton(TopPanelButton.Save, page); @@ -60,14 +50,13 @@ test.describe('Reagents molecule below arrow', () => { await page.getByRole('option', { name: 'SVG Document' }).click(); }); - // TODO flaky - test.fixme('Save PNG with reagent HCl below arrow', async ({ page }) => { + test('Save PNG with reagent HCl below arrow', async ({ page }) => { /* Test case: EPMLSOPKET-4698 Description: File is shown in the preview with the HCl reagent below the arrow */ await openFileAndAddToCanvas( - 'Ket/benzene-arrow-benzene-reagent-hcl.ket', + 'KET/benzene-arrow-benzene-reagent-hcl.ket', page, ); diff --git a/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts-snapshots/Reagents-molecule-below-arrow-Save-PNG-with-reagent-HCl-below-arrow-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts-snapshots/Reagents-molecule-below-arrow-Save-PNG-with-reagent-HCl-below-arrow-1-chromium-linux.png index 77f0d1edda..714adfda9a 100644 Binary files a/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts-snapshots/Reagents-molecule-below-arrow-Save-PNG-with-reagent-HCl-below-arrow-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts-snapshots/Reagents-molecule-below-arrow-Save-PNG-with-reagent-HCl-below-arrow-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts-snapshots/Reagents-molecule-below-arrow-Save-SVG-with-reagent-HCl-below-arrow-1-chromium-linux.png b/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts-snapshots/Reagents-molecule-below-arrow-Save-SVG-with-reagent-HCl-below-arrow-1-chromium-linux.png index 0a74f1ec7e..060a8b229b 100644 Binary files a/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts-snapshots/Reagents-molecule-below-arrow-Save-SVG-with-reagent-HCl-below-arrow-1-chromium-linux.png and b/ketcher-autotests/tests/Reagents/reagents-molecule-below-arrow.spec.ts-snapshots/Reagents-molecule-below-arrow-Save-SVG-with-reagent-HCl-below-arrow-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 b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts index 201e3937de..cde61e4659 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts @@ -223,10 +223,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1632 Description: User is able to remove the attachment points. */ - await openFileAndAddToCanvas( - 'Ket/Ket/chain-with-attachment-points.ket', - page, - ); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await selectNestedTool(page, RgroupTool.ATTACHMENT_POINTS); await setAttachmentPoints( page, @@ -255,7 +252,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1644 Description: The attachment point's asterisk is colored with the same color as the atom symbol. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await selectAtomInToolbar(AtomButton.Nitrogen, page); await clickOnAtom(page, 'C', 2); @@ -273,7 +270,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1644 Description: The Not List atom, Any Atom, Group Generics is attached to attachment points. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await selectNotListAtoms(page); await clickOnAtom(page, 'C', 2); @@ -290,7 +287,7 @@ test.describe('Attachment Point Tool', () => { Description: Attachment points are created correctly if the reaction arrow and plus sign(s) are present on the canvas. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectNestedTool(page, RgroupTool.ATTACHMENT_POINTS); await setAttachmentPoints( @@ -321,7 +318,7 @@ test.describe('Attachment Point Tool', () => { Description: Pasted structures are displayed with correct attachment points. Undo/Redo actions for each step are correct. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await copyAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); @@ -334,7 +331,7 @@ test.describe('Attachment Point Tool', () => { Description: Pasted structures are displayed with correct attachment points. Undo/Redo actions for each step are correct. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await cutAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); @@ -347,7 +344,7 @@ test.describe('Attachment Point Tool', () => { Description: Pasted structures are displayed with the correct attachment points. Undo/Redo actions for each step are correct. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await copyAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); }); @@ -360,7 +357,7 @@ test.describe('Attachment Point Tool', () => { */ const x = 0; const y = 300; - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await cutAndPaste(page); await page.mouse.click(x, y); @@ -372,7 +369,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1651 Description: Structure with attachment points saved as .mol file */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getMolfile(page); await saveToFile('chain-with-attachment-points-expected.mol', expectedFile); const METADATA_STRING_INDEX = [1]; @@ -392,10 +389,9 @@ test.describe('Attachment Point Tool', () => { Description: Click the 'Save As' button, and click the 'Save' button. Open the saved *.mol file and edit it in any way. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getMolfile(page); await saveToFile('chain-with-attachment-points-expected.mol', expectedFile); - await openFile('chain-with-attachment-points-expected.mol', page); const METADATA_STRING_INDEX = [1]; const { fileExpected: molFileExpected, file: molFile } = await receiveFileComparisonData({ @@ -412,7 +408,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1651 Description: Structure with attachment points saved as .mol file V3000 */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getMolfile(page, 'v3000'); await saveToFile( 'chain-with-attachment-points-expectedV3000.mol', @@ -435,7 +431,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1652 Description: Structure with attachment points saved as .rxn file */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); const expectedFile = await getRxn(page); await saveToFile('reaction-with-arrow-and-plus-expected.rxn', expectedFile); @@ -456,10 +452,9 @@ test.describe('Attachment Point Tool', () => { Description: Click the 'Save As' button and click the 'Save' button. Open the saved *.rxn file and edit it in any way. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); const expectedFile = await getRxn(page); await saveToFile('reaction-with-arrow-and-plus-expected.rxn', expectedFile); - await openFile('reaction-with-arrow-and-plus-expected.rxn', page); const METADATA_STRING_INDEX = [2, 7, 30, 37]; const { fileExpected: rxnFileExpected, file: rxnFile } = @@ -477,7 +472,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1652 Description: Structure with attachment points saved as .rxn file V3000 */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); const expectedFile = await getRxn(page, 'v3000'); await saveToFile( 'reaction-with-arrow-and-plus-expectedV3000.rxn', @@ -501,7 +496,7 @@ test.describe('Attachment Point Tool', () => { Test case: EPMLSOPKET-1653 Description: Structure with attachment points saved as .smi file */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getSmiles(page); await saveToFile('chain-with-attachment-points-expected.smi', expectedFile); @@ -524,10 +519,9 @@ test.describe('Attachment Point Tool', () => { Click the 'Save As' button, save as CML file. Open the saved *.cml file and edit it in any way. */ - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); const expectedFile = await getSmiles(page); await saveToFile('chain-with-attachment-points-expected.smi', expectedFile); - await openFile('chain-with-attachment-points-expected.smi', page); const { fileExpected: smiFileExpected, file: smiFile } = await receiveFileComparisonData({ @@ -570,7 +564,7 @@ test.describe('Attachment Point Tool', () => { x: 20, y: 160, }; - await openFileAndAddToCanvas('Ket/chain-with-attachment-points.ket', page); + await openFileAndAddToCanvas('KET/chain-with-attachment-points.ket', page); await page.keyboard.press('Control+a'); const coordinates = await getRotationHandleCoordinates(page); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Attachment-Point-Tool/attachment-point-tool.spec.ts-snapshots/Attachment-Point-Tool-Click-and-Save-as-mol-file-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-Click-and-Save-as-mol-file-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-Click-and-Save-as-mol-file-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-Click-and-Save-as-rxn-file-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-Click-and-Save-as-rxn-file-1-chromium-linux.png new file mode 100644 index 0000000000..97bce64896 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-Click-and-Save-as-rxn-file-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-Click-and-Save-as-smi-file-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-Click-and-Save-as-smi-file-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-Click-and-Save-as-smi-file-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts index 29516e8cd9..471d66d951 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts @@ -297,7 +297,7 @@ test.describe('R-Group Label Tool', () => { const x = 500; const y = 200; const anyAtom = 3; - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectLeftPanelButton(LeftPanelButton.R_GroupLabelTool, page); await clickOnAtom(page, 'C', anyAtom); await pressButton(page, 'R8'); @@ -318,7 +318,7 @@ test.describe('R-Group Label Tool', () => { const x = 500; const y = 200; const anyAtom = 3; - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectLeftPanelButton(LeftPanelButton.R_GroupLabelTool, page); await clickOnAtom(page, 'C', anyAtom); await pressButton(page, 'R8'); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts index f4901d23e7..dc4ce4f0fb 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Data-S-Group-Tool/data-s-group-tool.spec.ts @@ -129,7 +129,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1511 Description: User is able to edit the Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await editSGroupProperties(page, '33', 'Data', 'Multiple group', '1'); }); @@ -138,7 +138,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1514 Description: User is able to copy and paste structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await copyAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); }); @@ -148,7 +148,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1514 Description: User is able to cut and paste structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await cutAndPaste(page); await clickInTheMiddleOfTheScreen(page); }); @@ -243,7 +243,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1553 Description: Data S-Group added to only structures. Not to plus sign and arrow. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectSGroupProperties( page, 'Fragment', @@ -262,7 +262,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1553 Description: Data S-Group attached to only on atoms of structures. Not to plus sign and arrow. */ - await openFileAndAddToCanvas('Ket/reaction-with-arrow-and-plus.ket', page); + await openFileAndAddToCanvas('KET/reaction-with-arrow-and-plus.ket', page); await selectSGroupProperties( page, 'Fragment', @@ -279,7 +279,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1543 Description: User is able to edit the Data S-group Field name and Field Value. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await selectSGroupProperties( page, 'Fragment', @@ -295,7 +295,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1544 Description: User is able to add atom on structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await selectAtomInToolbar(AtomButton.Oxygen, page); await clickOnAtom(page, 'C', 3); await resetCurrentTool(page); @@ -308,7 +308,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1544 Description: User is able to delete and undo/redo atom on structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await selectLeftPanelButton(LeftPanelButton.Erase, page); await clickOnAtom(page, 'C', 3); await takeEditorScreenshot(page); @@ -323,7 +323,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1544 Description: User is able to add R-Group Label and Undo/Redo on structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await selectLeftPanelButton(LeftPanelButton.R_GroupLabelTool, page); await clickOnAtom(page, 'C', 3); await pressButton(page, 'R8'); @@ -341,7 +341,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1544 Description: User is able to delete whole Chain with Data S-Group and undo/redo. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); await page.keyboard.press('Control+a'); await page.getByTestId('delete').click(); await takeEditorScreenshot(page); @@ -356,7 +356,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-1513 Description: User is able to delete and undo/redo by hotkeys atom on structure with Data S-group. */ - await openFileAndAddToCanvas('Ket/chain-with-name-and-value.ket', page); + await openFileAndAddToCanvas('KET/chain-with-name-and-value.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 3); await page.mouse.move(point.x, point.y); await page.keyboard.press('Delete'); @@ -429,7 +429,7 @@ test.describe('Data S-Group tool', () => { Test case: EPMLSOPKET-8907 Description: Hover over created S-Group displays tooltip for Benzene ring with Nitrogen atom */ - await openFileAndAddToCanvas('Ket/benzene-with-data-s-group.ket', page); + await openFileAndAddToCanvas('KET/benzene-with-data-s-group.ket', page); await clickInTheMiddleOfTheScreen(page); }); }); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/SRU-Polymer/sru-polymer-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/SRU-Polymer/sru-polymer-tool.spec.ts index c3d78b86e3..106cc3c381 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/SRU-Polymer/sru-polymer-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/SRU-Polymer/sru-polymer-tool.spec.ts @@ -273,7 +273,7 @@ test.describe('SRU Polymer tool', () => { Test case: EPMLSOPKET-1536 Description: User is able to save and open structure with SRU polymer S-group. */ - await openFileAndAddToCanvas('Ket/sru-polymer-data.ket', page); + await openFileAndAddToCanvas('KET/sru-polymer-data.ket', page); const expectedFile = await getMolfile(page); await saveToFile('sru-polymer-data-expected.mol', expectedFile); const METADATA_STRING_INDEX = [1]; diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts index c8abeb83c2..7d768bb5d3 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/S-Group-Tool/Superatom-S-Group-Tool/superatom-s-group-tool.spec.ts @@ -218,7 +218,7 @@ test.describe('Superatom S-Group tool', () => { Test case: EPMLSOPKET-1541 Description: User is able to save and open structure with Superatom S-group. */ - await openFileAndAddToCanvas('Ket/superatom-all-chain.ket', page); + await openFileAndAddToCanvas('KET/superatom-all-chain.ket', page); const expectedFile = await getMolfile(page); await saveToFile('superatom-all-chain-expected.mol', expectedFile); const METADATA_STRING_INDEX = [1]; @@ -238,7 +238,7 @@ test.describe('Superatom S-Group tool', () => { Test case: EPMLSOPKET-12990 Description: User is able to contract/expand/remove abbreviation on structure with Superatom S-group. */ - await openFileAndAddToCanvas('Ket/superatom-all-chain.ket', page); + await openFileAndAddToCanvas('KET/superatom-all-chain.ket', page); await contractExpandRemoveAbbreviation(page, 'Test@!#$%12345'); }); @@ -249,7 +249,7 @@ test.describe('Superatom S-Group tool', () => { Test case: EPMLSOPKET-12991 Description: User is able to contract/expand/remove abbreviation on atom with Superatom S-group. */ - await openFileAndAddToCanvas('Ket/superatom-one-atom-on-chain.ket', page); + await openFileAndAddToCanvas('KET/superatom-one-atom-on-chain.ket', page); await contractExpandRemoveAbbreviation(page, 'Test@!#$%12345'); }); }); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/selection-tool.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/selection-tool.spec.ts index 7576ab1fef..1998339546 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/selection-tool.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/selection-tool.spec.ts @@ -60,7 +60,7 @@ test.describe('Selection tools', () => { Description: Selected atoms are replaces with those assigned to the hotkey. Selected tool remains active and the atom does not appear under mouse cursor. */ - await openFileAndAddToCanvas('Ket/two-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-atoms.ket', page); await page.keyboard.press('Control+a'); await page.keyboard.press('o'); }); @@ -94,7 +94,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15508 Description: All selected structures are flipped horizontally based on the selection box origin. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await page.keyboard.press('Control+a'); await pressButton(page, 'Horizontal Flip (Alt+H)'); }); @@ -106,7 +106,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15509 Description: All selected structures are flipped horizontally based on the selection box origin. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await page.keyboard.press('Control+a'); await pressButton(page, 'Vertical Flip (Alt+V)'); }); @@ -116,7 +116,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15510 Description: All selected structures are deleted from the canvas. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await page.keyboard.press('Control+a'); await page.getByTestId('delete').click(); }); @@ -129,7 +129,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 1 pixel in the corresponding direction with each key press. In this test to 50px Down. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); for (let i = 0; i < 50; i++) { @@ -145,7 +145,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 1 pixel in the corresponding direction with each key press. In this test to 50px Up. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); for (let i = 0; i < 50; i++) { @@ -161,7 +161,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 1 pixel in the corresponding direction with each key press. In this test to 50px Right. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); for (let i = 0; i < 50; i++) { @@ -177,7 +177,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 1 pixel in the corresponding direction with each key press. In this test to 50px Left. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); for (let i = 0; i < 50; i++) { @@ -193,7 +193,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 10 pixel in the corresponding direction with each key press with Shift key. In this test to 100px Down. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); await page.keyboard.down('Shift'); @@ -211,7 +211,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 10 pixel in the corresponding direction with each key press with Shift key. In this test to 100px Up. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); await page.keyboard.down('Shift'); @@ -229,7 +229,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 10 pixel in the corresponding direction with each key presswith Shift key. In this test to 100px Right. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); await page.keyboard.down('Shift'); @@ -247,7 +247,7 @@ test.describe('Selection tools', () => { Description: The selected structure should move 10 pixel in the corresponding direction with each key press with Shift key. In this test to 100px Left. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await takeEditorScreenshot(page); await page.keyboard.press('Control+a'); await page.keyboard.down('Shift'); @@ -269,7 +269,7 @@ test.describe('Selection tools', () => { const pointx1 = 750; const pointy1 = 300; - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await selectLeftPanelButton(LeftPanelButton.S_Group, page); await clickOnAtom(page, 'C', 0); await fillFieldByPlaceholder(page, 'Enter name', 'Test'); @@ -325,7 +325,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15514 Description: The canvas should automatically expand in the direction the structure is being moved. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); @@ -344,7 +344,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15514 Description: The canvas should automatically expand in the direction the structure is being moved. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); @@ -363,7 +363,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15515 Description: The canvas should automatically expand in the direction the structure is being moved. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); @@ -383,7 +383,7 @@ test.describe('Selection tools', () => { Test case: EPMLSOPKET-15515 Description: The canvas should automatically expand in the direction the structure is being moved. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); @@ -404,7 +404,7 @@ test.describe('Selection tools', () => { Description: The canvas should automatically expand in the direction the structure is being moved. Structure is visible on the canvas. */ - await openFileAndAddToCanvas('Ket/two-benzene-with-atoms.ket', page); + await openFileAndAddToCanvas('KET/two-benzene-with-atoms.ket', page); await delay(DELAY_IN_SECONDS.TWO); await selectNestedTool(page, SelectTool.FRAGMENT_SELECTION); await clickOnAtom(page, 'N', 0); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts index 8a87c38d71..05cb3fcc62 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Properties/atom-properties.spec.ts @@ -197,7 +197,7 @@ test.describe('Atom Properties', () => { 'Cancel', 'Apply' and 'X' buttons; The 'Atom Properties' header. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'N', 0); }); @@ -223,7 +223,7 @@ test.describe('Atom Properties', () => { 'Cancel', 'Apply' and 'X' buttons; The 'Atom Properties' header. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await moveOnAtom(page, 'O', 0); await page.keyboard.press('/'); }); @@ -234,7 +234,7 @@ test.describe('Atom Properties', () => { Description: The 'Label' field contains the correct typed atom symbol. The selected carbon atom isn`t changed with 'Na' atom symbol. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectAtomLabel(page, 'Na', 'Cancel'); @@ -246,7 +246,7 @@ test.describe('Atom Properties', () => { Description: The 'Label' field contains the correct typed atom symbol. The selected carbon atom is changed with 'Sb' atom symbol. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectAtomLabel(page, 'Sb', 'Apply'); @@ -259,7 +259,7 @@ test.describe('Atom Properties', () => { The 'Label' field has a red frame. The 'Error: Wrong label' tooltip appears when the cursor is over the field. The Apply button becomes disabled. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'N', 0); await page.getByLabel('Label').fill('J%'); @@ -275,7 +275,7 @@ test.describe('Atom Properties', () => { when the cursor is over the field. The Apply button becomes disabled. The 'N' atom symbol isn`t changed with an incorrect symbol. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'N', 0); await selectAtomLabel(page, 'J%', 'Cancel'); @@ -410,7 +410,7 @@ test.describe('Atom Properties', () => { The 'Alias' field contains the correct typed characters. The selected carbon atom does not changed. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); @@ -424,7 +424,7 @@ test.describe('Atom Properties', () => { The 'Alias' field contains the correct typed characters. (for example 'abc123TesREasd!@'). The selected carbon atom is changed with typed text. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); @@ -454,7 +454,7 @@ test.describe('Atom Properties', () => { Description: In the opened dialog the 'Number' field contains the correct text (for our example - Carbon = 6). Nitrogen = 7, Oxygen = 8 */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await takeEditorScreenshot(page); @@ -477,7 +477,7 @@ test.describe('Atom Properties', () => { The '2' is present in the 'Charge' field. The '2-' symbol appears near the selected atom on top-right side. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await fillChargeForAtom(page, '1', 'Apply'); @@ -498,7 +498,7 @@ test.describe('Atom Properties', () => { The 'Error: Invalid charge value' tooltip appears when the cursor over the field. The 'Apply' button becomes disabled. */ - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await doubleClickOnAtom(page, 'C', 0); await page.getByLabel('Charge').fill('A'); @@ -569,7 +569,7 @@ test.describe('Atom Properties', () => { The 'Isotope' field contains the correct typed value. The isotope value does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await fillIsotopeForAtom(page, '18', 'Cancel'); @@ -582,7 +582,7 @@ test.describe('Atom Properties', () => { The 'Isotope' field contains the correct typed value. '13' appears near the carbon atom in top-left side. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await fillIsotopeForAtom(page, '13', 'Apply'); @@ -594,7 +594,7 @@ test.describe('Atom Properties', () => { Description: The 'Isotope' field is filled with '0' by default. Field highlight with red and tooltip appears: There must be integer! */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await page.getByLabel('Isotope').fill('b'); @@ -648,7 +648,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1617 Description: The 'Isotope' 18O added. Number colored in red as Oxygen atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await moveOnAtom(page, 'C', 1); await page.mouse.down(); @@ -690,7 +690,7 @@ test.describe('Atom Properties', () => { The 'Valence' field contains the selected value. The valence value does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectValenceForAtom(page, 'III', 'Cancel'); @@ -703,7 +703,7 @@ test.describe('Atom Properties', () => { The 'Valence' field contains the correct typed value. 'III' appears near the carbon atom in right side. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await selectValenceForAtom(page, 'III', 'Apply'); @@ -761,7 +761,7 @@ test.describe('Atom Properties', () => { The 'Radical' field contains the selected parameter. The radical symbol does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectRadical(page, 'Monoradical', 'Cancel'); @@ -777,7 +777,7 @@ test.describe('Atom Properties', () => { Diradical (singlet) - two dots; Diradical (triplet) - two caret signs (^^). */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await selectRadical(page, 'Monoradical', 'Apply'); @@ -823,7 +823,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1634 Description: All selected atoms is replaced with the typed atom symbols and Radicals. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await moveOnAtom(page, 'C', 0); await page.mouse.down(); @@ -881,7 +881,7 @@ test.describe('Atom Properties', () => { The 'Ring bond count' field contains the selected value. The Ring bond count value does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectRingBondCount(page, 'As drawn', 'Cancel'); @@ -896,7 +896,7 @@ test.describe('Atom Properties', () => { The 'Ring bond count' field contains the selected value. The selected Ring bond count - rb* - appears below the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 1); await selectRingBondCount(page, 'As drawn', 'Apply'); @@ -946,7 +946,7 @@ test.describe('Atom Properties', () => { Description: Several atoms are selected. All selected atoms are replaced with the correct atom symbol with the correct atom properties. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await moveOnAtom(page, 'C', 0); await page.mouse.down(); @@ -972,7 +972,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1638 Description: Ring bond count atom property is displayed as specified from the menu item. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectRingBondCount(page, 'As drawn', 'Apply'); @@ -994,7 +994,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1639 Description: Ring bond count atom property is displayed as specified from the menu item. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectRingBondCount(page, 'As drawn', 'Apply'); @@ -1033,7 +1033,7 @@ test.describe('Atom Properties', () => { The 'H count' drop-down list contains values: 0, 1, 2, 3, 4. The value is selected. The 'H count' field contains the selected value. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectHCount(page, '0', 'Cancel'); @@ -1048,7 +1048,7 @@ test.describe('Atom Properties', () => { The 'H count' field contains the selected value. The selected hydrogen count value (H2) appears below/above the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectHCount(page, '2', 'Apply'); @@ -1061,7 +1061,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1640 Description: The newly selected hydrogen count is assigned to the carbon atom */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectHCount(page, '2', 'Apply'); @@ -1102,7 +1102,7 @@ test.describe('Atom Properties', () => { Hydrogen count atom property is displayed as specified from the menu item. Nothing happens. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await page.getByText('Query specific').click(); @@ -1126,7 +1126,7 @@ test.describe('Atom Properties', () => { The 'Substitution count' field contains the selected value. The substitution count does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectSubstitutionCount(page, '0', 'Cancel'); @@ -1141,7 +1141,7 @@ test.describe('Atom Properties', () => { The 'Substitution count' field contains the selected value. The selected substitution count s* appears near the carbon */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectSubstitutionCount(page, '2', 'Apply'); @@ -1154,7 +1154,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-1642 Description: The newly selected Substitution count is assigned to the carbon atom */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectSubstitutionCount(page, '2', 'Apply'); @@ -1199,7 +1199,7 @@ test.describe('Atom Properties', () => { Number of nonhydrogen substituents is displayed as AtomSymbol(sN) where N depends on the number selected. Nothing is changed. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await page.getByText('Query specific').click(); @@ -1221,7 +1221,7 @@ test.describe('Atom Properties', () => { The 'Unsaturated' checkbox is present in the 'Query specific' field. The checkbox is not set by default. The unsaturated mark does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectUnsaturated(page, 'Cancel'); @@ -1236,7 +1236,7 @@ test.describe('Atom Properties', () => { The 'Unsaturated' checkbox is set. The 'u' mark appears below the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 3); await selectUnsaturated(page, 'Apply'); @@ -1264,7 +1264,7 @@ test.describe('Atom Properties', () => { Test case: EPMLSOPKET-8931 Description: Modal window opens without errors. All sections are displayed correctly. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 3); }); @@ -1290,7 +1290,7 @@ test.describe('Atom Properties', () => { "E" symbol appeared in "Atom" field next to "F". Selected atom now has "Fe" label. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await moveOnAtom(page, 'C', 3); await page.mouse.down(); @@ -1399,7 +1399,7 @@ test.describe('Atom Properties', () => { The 'Inversion' field contains the selected value. The stereo mark does not appear near the carbon atom. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 0); await selectReactionFlagsInversion(page, 'Inverts', 'Cancel'); @@ -1413,7 +1413,7 @@ test.describe('Atom Properties', () => { Description: The selected stereo mark appears near the carbon atom for Inverts - .Inv, ext. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 3); await selectReactionFlagsInversion(page, 'Inverts'); @@ -1429,7 +1429,7 @@ test.describe('Atom Properties', () => { Description: The selected stereo mark appears near the carbon atom for Retains - .Ret, ext. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await doubleClickOnAtom(page, 'C', 3); await selectReactionFlagsInversion(page, 'Retains'); diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/drag-and-drop-atom.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/drag-and-drop-atom.spec.ts index dcdaea338c..94342fb6fe 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/drag-and-drop-atom.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/drag-and-drop-atom.spec.ts @@ -74,7 +74,7 @@ test.describe('Drag and drop Atom on canvas', () => { await dragMouseTo(x, y, page); }); - test.fixme('The Nitrogen atom replaces the formic acid', async ({ page }) => { + test('The Nitrogen atom replaces the formic acid', async ({ page }) => { /* Test case: EPMLSOPKET-11833 Description: when drag & drop an atom on a Salts and Solvents it should replace it diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/drag-and-drop-atom.spec.ts-snapshots/Drag-and-drop-Atom-on-canvas-The-Nitrogen-atom-replaces-the-formic-acid-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/drag-and-drop-atom.spec.ts-snapshots/Drag-and-drop-Atom-on-canvas-The-Nitrogen-atom-replaces-the-formic-acid-1-chromium-linux.png index 92f13abce6..bcc3e05611 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/drag-and-drop-atom.spec.ts-snapshots/Drag-and-drop-Atom-on-canvas-The-Nitrogen-atom-replaces-the-formic-acid-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Atom/Atom-Tool/drag-and-drop-atom.spec.ts-snapshots/Drag-and-drop-Atom-on-canvas-The-Nitrogen-atom-replaces-the-formic-acid-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts b/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts index 06713b8517..7d6471999b 100644 --- a/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts +++ b/ketcher-autotests/tests/Structure-Creating-&-Editing/Text-Tool/utf-8-svg-png.spec.ts @@ -6,19 +6,21 @@ import { openFileAndAddToCanvas, delay, DELAY_IN_SECONDS, + waitForIndigoToLoad, } from '@utils'; test.describe('Open UTF-8 and save as SVG and PNG', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); - test.fixme('Open UTF-8 file and save as SVG', async ({ page }) => { + test('Open UTF-8 file and save as SVG', async ({ page }) => { /* Test case: EPMLSOPKET-5252 Description: A file with UTF-8 encoding opens and, when saved in a SVG preview, contains all characters */ - await openFileAndAddToCanvas('Ket/utf-8-svg-png.ket', page); + await openFileAndAddToCanvas('KET/utf-8-svg-png.ket', page); await delay(DELAY_IN_SECONDS.THREE); await selectTopPanelButton(TopPanelButton.Save, page); await page.getByRole('button', { name: 'MDL Rxnfile V2000' }).click(); @@ -27,12 +29,12 @@ test.describe('Open UTF-8 and save as SVG and PNG', () => { await takeEditorScreenshot(page); }); - test.fixme('Open UTF-8 file and save as PNG', async ({ page }) => { + test('Open UTF-8 file and save as PNG', async ({ page }) => { /* Test case: EPMLSOPKET-5252 Description: A file with UTF-8 encoding opens and, when saved in a PNG preview, contains all characters */ - await openFileAndAddToCanvas('Ket/utf-8-svg-png.ket', page); + await openFileAndAddToCanvas('KET/utf-8-svg-png.ket', page); await delay(DELAY_IN_SECONDS.THREE); await selectTopPanelButton(TopPanelButton.Save, page); diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/Functional-Group-Tools/functional-group-tools.spec.ts index 44b59ea097..028af405cd 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 @@ -327,38 +327,37 @@ test.describe('Templates - Functional Group Tools2', () => { await pressButton(page, 'Horizontal Flip (Alt+H)'); }); - test.fixme( - 'Erase of contracted and expanded Functional Group', - async ({ page }) => { - /* + test('Erase of contracted and expanded Functional Group', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-2901 Description: Contracted Functional Group is removed after click with Erase tool; Expanded Functional Group is removed if were selected by Rectangle selection; EDIT ABBREVIATION window appears if click by Erase tool on expanded FG without selection. */ - 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.Erase, page); - await page.getByText('Boc').first().click(); + await selectLeftPanelButton(LeftPanelButton.Erase, page); + await page.getByText('Boc').first().click(); - await resetCurrentTool(page); - await takeEditorScreenshot(page); + await resetCurrentTool(page); + await takeEditorScreenshot(page); - await selectTopPanelButton(TopPanelButton.Undo, page); - await page.getByText('Boc').first().click(); - await selectLeftPanelButton(LeftPanelButton.Erase, page); + await selectTopPanelButton(TopPanelButton.Undo, page); + await page.getByText('Boc').first().click(); + await selectLeftPanelButton(LeftPanelButton.Erase, page); - await resetCurrentTool(page); - await takeEditorScreenshot(page); + await resetCurrentTool(page); + await takeEditorScreenshot(page); - await openFileAndAddToCanvas('functional-group-expanded.mol', page); - await page.keyboard.press('Control+a'); - await page.getByTestId('delete').click(); - }, - ); + await openFileAndAddToCanvas('functional-group-expanded.mol', page); + await page.keyboard.press('Control+a'); + await page.getByTestId('delete').click(); + }); test('Add Template to the Functional group', async ({ page }) => { /* diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts index 0cf1b7c1e6..ef028628e1 100644 --- a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts +++ b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts @@ -29,6 +29,7 @@ import { pressTab, FILE_TEST_DATA, STRUCTURE_LIBRARY_BUTTON_NAME, + waitForIndigoToLoad, } from '@utils'; import { getAtomByIndex } from '@utils/canvas/atoms'; import { TestIdSelectors } from '@utils/selectors/testIdSelectors'; @@ -76,6 +77,7 @@ async function changeStatusOfAbbreviation( test.describe('Functional Groups', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { @@ -227,7 +229,7 @@ test.describe('Functional Groups', () => { Test case: EPMLSOPKET-2894 Description: Contracted and Expanded functional groups are displayed on the canvas. */ - await openFileAndAddToCanvas('Ket/expanded-and-contracted-fg.ket', page); + await openFileAndAddToCanvas('KET/expanded-and-contracted-fg.ket', page); }); test('Paste from Clipboard with contracted and expanded functional groups', async ({ @@ -244,19 +246,18 @@ test.describe('Functional Groups', () => { await clickInTheMiddleOfTheScreen(page); }); - test.fixme( - 'Highlight Functional Group with Selection tool', - async ({ page }) => { - /* + test('Highlight Functional Group with Selection tool', async ({ page }) => { + /* Test case: EPMLSOPKET-2899 Description: Expanded functional group are highlight with Selection tool. */ - const x = 570; - const y = 320; - await openFileAndAddToCanvas('functional-group-expanded.mol', page); - await page.mouse.move(x, y); - }, - ); + const x = 600; + const y = 400; + const smallShift = 10; + await openFileAndAddToCanvas('functional-group-expanded.mol', page); + await page.mouse.move(x, y); + await page.mouse.move(x + smallShift, y); + }); test('Add Bond to expanded Functional Group', async ({ page }) => { /* @@ -412,22 +413,21 @@ test.describe('Functional Groups', () => { await page.getByText('Expand Abbreviation').click(); }); - test.fixme( - 'Ordinary elements should not show explicit valences (PO4H2)', - async ({ page }) => { - /* + test('Ordinary elements should not show explicit valences (PO4H2)', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-8915 Description: Ordinary elements should not show explicit valences for 'P'. */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await pressTab(page, 'Functional Groups'); - await selectFunctionalGroups(FunctionalGroups.PO4H2, page); - await clickInTheMiddleOfTheScreen(page); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await pressTab(page, 'Functional Groups'); + await selectFunctionalGroups(FunctionalGroups.PO4H2, page); + await clickInTheMiddleOfTheScreen(page); - await clickInTheMiddleOfTheScreen(page, 'right'); - await page.getByText('Expand Abbreviation').click(); - }, - ); + await clickInTheMiddleOfTheScreen(page, 'right'); + await page.getByText('Expand Abbreviation').click(); + }); test('Selection highlight is displayed correctly for functional groups with longer names', async ({ page, @@ -461,22 +461,21 @@ test.describe('Functional Groups', () => { await clickInTheMiddleOfTheScreen(page); }); - test.fixme( - 'Selection highlight appears immediately after hover over text', - async ({ page }) => { - /* + test('Selection highlight appears immediately after hover over text', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-8920 Description: Selection highlight appears immediately after hover over text. */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await pressTab(page, 'Salts and Solvents'); - await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page); - await clickInTheMiddleOfTheScreen(page); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await pressTab(page, 'Salts and Solvents'); + await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page); + await clickInTheMiddleOfTheScreen(page); - await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); - await page.getByText('me').first().hover(); - }, - ); + await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); + await page.getByText('me').first().hover(); + }); test('Add Atom by hotkey to expanded Functional Group', async ({ page }) => { /* @@ -489,27 +488,26 @@ test.describe('Functional Groups', () => { await page.keyboard.press('n'); }); - test.fixme( - 'Add Atom by hotkey to expanded Salts and Solvents', - async ({ page }) => { - /* + test('Add Atom by hotkey to expanded Salts and Solvents', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-8928 Description: When Adding 'Atom' by hotkey to expanded Salts and Solvents system display 'Edit Abbreviation' pop-up window. */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await pressTab(page, 'Salts and Solvents'); - await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page); - await clickInTheMiddleOfTheScreen(page); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await pressTab(page, 'Salts and Solvents'); + await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page); + await clickInTheMiddleOfTheScreen(page); - await clickInTheMiddleOfTheScreen(page, 'right'); - await page.getByText('Expand Abbreviation').click(); + await clickInTheMiddleOfTheScreen(page, 'right'); + await page.getByText('Expand Abbreviation').click(); - await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); - point = await getAtomByIndex(page, { label: 'S' }, 0); - await page.mouse.move(point.x, point.y); - await page.keyboard.press('n'); - }, - ); + await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); + point = await getAtomByIndex(page, { label: 'S' }, 0); + await page.mouse.move(point.x, point.y); + await page.keyboard.press('n'); + }); test('Add Functional Group abbreviation to FG connected to terminal atoms of structure', async ({ page, @@ -521,7 +519,7 @@ test.describe('Functional Groups', () => { */ const x = 540; const y = 350; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); await pressTab(page, 'Functional Groups'); await selectFunctionalGroups(FunctionalGroups.CN, page); @@ -553,24 +551,23 @@ test.describe('Functional Groups', () => { await resetCurrentTool(page); }); - test.fixme( - 'Hotkey (Del) can delete Salts and Solvents abbreviation', - async ({ page }) => { - /* + test('Hotkey (Del) can delete Salts and Solvents abbreviation', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-11844 Description: Hotkey (Del) delete Salts and Solvents abbreviation. */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await pressTab(page, 'Salts and Solvents'); - await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page); - await clickInTheMiddleOfTheScreen(page); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await pressTab(page, 'Salts and Solvents'); + await selectSaltsAndSolvents(SaltsAndSolvents.MethaneSulphonicAcid, page); + await clickInTheMiddleOfTheScreen(page); - await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); - await moveMouseToTheMiddleOfTheScreen(page); - await page.keyboard.press('Delete'); - await resetCurrentTool(page); - }, - ); + await selectLeftPanelButton(LeftPanelButton.RectangleSelection, page); + await moveMouseToTheMiddleOfTheScreen(page); + await page.keyboard.press('Delete'); + await resetCurrentTool(page); + }); test.skip('Hotkey for Atom can replace Functional Groups abbreviation', async ({ page, @@ -615,7 +612,7 @@ test.describe('Functional Groups', () => { Test case: EPMLSOPKET-11849 Description: Structure on canvas not becomes 'undefined' when atom is hovered and Functional Group selected using hotkey. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); point = await getAtomByIndex(page, { label: 'C' }, 3); await page.mouse.move(point.x, point.y); await page.keyboard.press('Shift+t'); @@ -639,25 +636,24 @@ test.describe('Functional Groups', () => { await page.getByText('Contract Abbreviation').click(); }); - test.fixme( - 'Check that expanded Functional Groups not overlap each other', - async ({ page }) => { - /* + test('Check that expanded Functional Groups not overlap each other', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-12977 Description: Expanded Functional Groups not overlap each other */ - await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); - await pressTab(page, 'Functional Groups'); - await selectFunctionalGroups(FunctionalGroups.Cbz, page); - await clickInTheMiddleOfTheScreen(page); + await pressButton(page, STRUCTURE_LIBRARY_BUTTON_NAME); + await pressTab(page, 'Functional Groups'); + await selectFunctionalGroups(FunctionalGroups.Cbz, page); + await clickInTheMiddleOfTheScreen(page); - await drawFGAndDrag(FunctionalGroups.Boc, 50, page); + await drawFGAndDrag(FunctionalGroups.Boc, 50, page); - await page.keyboard.press('Control+a'); - await clickInTheMiddleOfTheScreen(page, 'right'); - await page.getByText('Expand Abbreviation').click(); - }, - ); + await page.keyboard.press('Control+a'); + await clickInTheMiddleOfTheScreen(page, 'right'); + await page.getByText('Expand Abbreviation').click(); + }); test.skip('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-Add-Atom-by-hotkey-to-expanded-Salts-and-Solvents-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Add-Atom-by-hotkey-to-expanded-Salts-and-Solvents-1-chromium-linux.png index adb7d6af03..d1d1f5edd1 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Add-Atom-by-hotkey-to-expanded-Salts-and-Solvents-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Add-Atom-by-hotkey-to-expanded-Salts-and-Solvents-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Check-that-expanded-Functional-Groups-not-overlap-each-other-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Check-that-expanded-Functional-Groups-not-overlap-each-other-1-chromium-linux.png new file mode 100644 index 0000000000..ca1267e870 Binary files /dev/null and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Check-that-expanded-Functional-Groups-not-overlap-each-other-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Highlight-Functional-Group-with-Selection-tool-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Highlight-Functional-Group-with-Selection-tool-1-chromium-linux.png index ca5ede2af2..fc4306ce09 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Highlight-Functional-Group-with-Selection-tool-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Highlight-Functional-Group-with-Selection-tool-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Hotkey-Del-can-delete-Salts-and-Solvents-abbreviation-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Hotkey-Del-can-delete-Salts-and-Solvents-abbreviation-1-chromium-linux.png index adb7d6af03..b06752df37 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Hotkey-Del-can-delete-Salts-and-Solvents-abbreviation-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Hotkey-Del-can-delete-Salts-and-Solvents-abbreviation-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Ordinary-elements-should-not-show-explicit-valences-PO4H2-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Ordinary-elements-should-not-show-explicit-valences-PO4H2-1-chromium-linux.png index 7a1c1eb7cd..f63d472280 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Ordinary-elements-should-not-show-explicit-valences-PO4H2-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Ordinary-elements-should-not-show-explicit-valences-PO4H2-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Selection-highlight-appears-immediately-after-hover-over-text-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Selection-highlight-appears-immediately-after-hover-over-text-1-chromium-linux.png index adb7d6af03..429c554c2f 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Selection-highlight-appears-immediately-after-hover-over-text-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/functional-groups.spec.ts-snapshots/Functional-Groups-Selection-highlight-appears-immediately-after-hover-over-text-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Salts-and-Solvents/click-and-drag-salts-on-canvas.spec.ts b/ketcher-autotests/tests/Templates/Salts-and-Solvents/click-and-drag-salts-on-canvas.spec.ts index 76783cd36c..f562f81e16 100644 --- a/ketcher-autotests/tests/Templates/Salts-and-Solvents/click-and-drag-salts-on-canvas.spec.ts +++ b/ketcher-autotests/tests/Templates/Salts-and-Solvents/click-and-drag-salts-on-canvas.spec.ts @@ -57,22 +57,21 @@ test.describe('Click and drag Salts and Solvents on canvas', () => { await drawSaltAndDrag(SaltsAndSolvents.AceticAcid, SHIFT, page); }); - test.fixme( - 'Propionic acid appears near Methane sulphonic acid', - async ({ page }) => { - /* + test('Propionic acid appears near Methane sulphonic acid', async ({ + page, + }) => { + /* Test case: EPMLSOPKET-11557 Description: when click & drag with a Salts and Solvents on Salts and Solvents Salts appears near Salts where the left mouse button was released */ - 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 drawSaltAndDrag(SaltsAndSolvents.PropionicAcid, SHIFT, page); - }, - ); + await drawSaltAndDrag(SaltsAndSolvents.PropionicAcid, SHIFT, page); + }); test('Isobutanol appears near Oxygen atom', async ({ page }) => { /* diff --git a/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts b/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts index e7d4a888c3..d023f72149 100644 --- a/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts +++ b/ketcher-autotests/tests/Templates/User-Templates/user-templates.spec.ts @@ -15,6 +15,8 @@ import { selectUserTemplatesAndPlaceInTheMiddle, getControlModifier, STRUCTURE_LIBRARY_BUTTON_NAME, + waitForSpinnerFinishedWork, + waitForIndigoToLoad, } from '@utils'; import { TestIdSelectors } from '@utils/selectors/testIdSelectors'; @@ -253,6 +255,7 @@ test.describe('Click User Templates on canvas', () => { test.describe('Click User Templates on canvas', () => { test.beforeEach(async ({ page }) => { await page.goto(''); + await waitForIndigoToLoad(page); }); test.afterEach(async ({ page }) => { @@ -280,7 +283,7 @@ test.describe('Click User Templates on canvas', () => { await resetCurrentTool(page); }); - test.fixme('Create Template - saving', async ({ page }) => { + test('Create Template - saving', async ({ page }) => { /* Test case: EPMLSOPKET-1722 Description: saving user template validation @@ -295,7 +298,9 @@ test.describe('Click User Templates on canvas', () => { await page.getByPlaceholder('template').click(); await page.getByPlaceholder('template').fill('user_template_1'); await page.getByRole('button', { name: 'Save', exact: true }).click(); - await selectTopPanelButton(TopPanelButton.Clean, page); + await waitForSpinnerFinishedWork(page, async () => { + await selectTopPanelButton(TopPanelButton.Clean, page); + }); await openStructureLibrary(page); await page.getByRole('button', { name: 'User Templates (1)' }).click(); diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts index 248cf4de48..bd8c447c11 100644 --- a/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Editing-Tools/Copy-Cut-Paste/copy-cut-paste.spec.ts @@ -683,7 +683,7 @@ test.describe('Copy/Cut/Paste Actions', () => { // Error message when run under docker. But manual test is working. const x = 100; const y = 100; - await openFileAndAddToCanvas('Ket/stereo-test-structures.ket', page); + await openFileAndAddToCanvas('KET/stereo-test-structures.ket', page); await copyAndPaste(page); await page.mouse.click(x, y); }, @@ -698,7 +698,7 @@ test.describe('Copy/Cut/Paste Actions', () => { */ // Error message when run under docker. But manual test is working. const anyAtom = 5; - await openFileAndAddToCanvas('Ket/stereo-test-structures.ket', page); + await openFileAndAddToCanvas('KET/stereo-test-structures.ket', page); await cutAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); await selectAtomInToolbar(AtomButton.Nitrogen, page); @@ -750,7 +750,7 @@ test.describe('Copy/Cut/Paste Actions', () => { const x = 550; const y = 150; await openFileAndAddToCanvas( - 'Ket/structure-with-simple-objects-and-text.ket', + 'KET/structure-with-simple-objects-and-text.ket', page, ); await copyAndPaste(page); @@ -769,7 +769,7 @@ test.describe('Copy/Cut/Paste Actions', () => { // Can't attach atom of Nitrogen to structure. const anyAtom = 5; await openFileAndAddToCanvas( - 'Ket/structure-with-simple-objects-and-text.ket', + 'KET/structure-with-simple-objects-and-text.ket', page, ); await cutAndPaste(page); @@ -825,7 +825,7 @@ test.describe('Copy/Cut/Paste Actions', () => { */ const x = 500; const y = 100; - await openFileAndAddToCanvas('Ket/expanded-and-contracted-fg.ket', page); + await openFileAndAddToCanvas('KET/expanded-and-contracted-fg.ket', page); await copyAndPaste(page); await page.mouse.click(x, y); }); @@ -841,7 +841,7 @@ test.describe('Copy/Cut/Paste Actions', () => { */ // Can't attach atom of Nitrogen to the structure. const anyAtom = 5; - await openFileAndAddToCanvas('Ket/expanded-and-contracted-fg.ket', page); + await openFileAndAddToCanvas('KET/expanded-and-contracted-fg.ket', page); await cutAndPaste(page); await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y); await selectAtomInToolbar(AtomButton.Nitrogen, page); diff --git a/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts b/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts index 7874f3d2d3..174a3289ed 100644 --- a/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Editing-Tools/Undo-Redo/undo-redo-actions.spec.ts @@ -407,7 +407,7 @@ test.describe('Undo/Redo Actions', () => { Undo: the Mapping tool is removed; Redo: the Mapping tool is restored. */ - await openFileAndAddToCanvas('Ket/reaction-chain.ket', page); + await openFileAndAddToCanvas('KET/reaction-chain.ket', page); await selectNestedTool(page, ReactionMappingTool.AUTOMAP); await pressButton(page, 'Apply'); await delay(DELAY_IN_SECONDS.THREE); @@ -556,7 +556,7 @@ test.describe('Undo/Redo Actions', () => { } }); - test.fixme('Undo/Redo Copy/Past', async ({ page }) => { + test.fixme('Undo/Redo Copy/Paste', async ({ page }) => { /* Test case: EPMLSOPKET-1758 Description: Undo/Redo action should work correctly @@ -572,7 +572,7 @@ test.describe('Undo/Redo Actions', () => { await screenshotBetweenUndoRedo(page); }); - test.fixme('Undo/Redo Cut/Past', async ({ page }) => { + test.fixme('Undo/Redo Cut/Paste', async ({ page }) => { /* Test case: EPMLSOPKET-1758 Description: Undo/Redo action should work correctly diff --git a/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts index af7aae852e..f574017370 100644 --- a/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Outline-For-Hovered-Structures/outline-for-hovered-structures.spec.ts @@ -25,7 +25,7 @@ test.describe('Outline for hovered structures', () => { test('Should draw selection outline correctly for hovered structures', async ({ page, }) => { - await openFileAndAddToCanvas('Ket/benzene-ring-with-two-atoms.ket', page); + await openFileAndAddToCanvas('KET/benzene-ring-with-two-atoms.ket', page); await page.keyboard.press('Control+KeyA'); await page.keyboard.down('Control'); diff --git a/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-1fa6d--when-context-menu-is-shown-after-right-click-2-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-1fa6d--when-context-menu-is-shown-after-right-click-2-chromium-linux.png index 90980e0f15..429996dc7f 100644 Binary files a/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-1fa6d--when-context-menu-is-shown-after-right-click-2-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Preview-For-Abbreviated-Structures/preview-for-abbreviated-structures.spec.ts-snapshots/Preview-for-abbreviated-structures-functional-1fa6d--when-context-menu-is-shown-after-right-click-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts index 06c4df00a4..e79ad147f7 100644 --- a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts +++ b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts @@ -31,7 +31,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5872 Description: The menu has appeared and contains the list of Bonds. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); }); @@ -41,7 +41,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5876 Description: The menu has appeared and contains the list of Query Bonds. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Query bonds').click(); @@ -52,7 +52,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5873 Description: Single Bond changes on Double Bond. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Edit...').click(); @@ -66,7 +66,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5874 Description: Single Bond changes on Double Bond. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Double', { exact: true }).click(); @@ -77,7 +77,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5875 Description: Bond is deleted */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Delete', { exact: true }).click(); @@ -91,7 +91,7 @@ test.describe('Right-click menu', () => { Description: Bond is deleted */ let point: { x: number; y: number }; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectAtomInToolbar(AtomButton.Oxygen, page); point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); @@ -112,13 +112,13 @@ test.describe('Right-click menu', () => { - Enhanced stereochemistry (Should be grayed out if enhanced stereochemistry can not be added.) - Delete */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 1); await page.mouse.click(point.x, point.y, { button: 'right' }); }); test('Check right-click property change for atoms', async ({ page }) => { - await openFileAndAddToCanvas('chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 1); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Query properties').click(); @@ -139,7 +139,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5880 Description: Carbon atom changes to Oxygen. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 1); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Edit...').click(); @@ -158,7 +158,7 @@ test.describe('Right-click menu', () => { - Enhanced stereochemistry (Should be grayed out if enhanced stereochemistry can not be added.) - Delete */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 1); await page.mouse.click(point.x, point.y, { button: 'right' }); }); @@ -170,7 +170,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5882 Description: 'Enhanced stereochemistry' is NOT grayed out (User can add Enhanced stereochemistry) */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); }); @@ -183,7 +183,7 @@ test.describe('Right-click menu', () => { Description: Near the atom with the stereochemistry the '&1' and '&2' is displayed. And 'Mixed' flag appears. After add Ignore the chiral flag in settings - 'Mixed' flag dissapear. */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Enhanced stereochemistry...').click(); @@ -209,7 +209,7 @@ test.describe('Right-click menu', () => { Description: Near the atom with the stereochemistry the '&1' and 'or1' is displayed. And 'Mixed' flag appears. After add Ignore the chiral flag in settings - 'Mixed' flag dissapear. */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Enhanced stereochemistry...').click(); @@ -233,7 +233,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-5883 Description: Atom is deleted by right-click menu */ - await openFileAndAddToCanvas('Ket/chain-with-stereo.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo.ket', page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Delete').click(); @@ -247,7 +247,7 @@ test.describe('Right-click menu', () => { Description: Only selected atoms and bonds are deleted. No error is thrown. */ let point: { x: number; y: number }; - await openFileAndAddToCanvas('Ket/chain-with-stereo-and-atoms.ket', page); + await openFileAndAddToCanvas('KET/chain-with-stereo-and-atoms.ket', page); point = await getAtomByIndex(page, { label: 'N' }, 0); await page.keyboard.down('Shift'); await page.mouse.click(point.x, point.y); @@ -266,7 +266,7 @@ test.describe('Right-click menu', () => { */ const canvasClickX = 300; const canvasClickY = 300; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectAtomInToolbar(AtomButton.Oxygen, page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); @@ -280,7 +280,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-10082 Description: Opens right-click menu for atom */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectLeftPanelButton(LeftPanelButton.S_Group, page); const point = await getAtomByIndex(page, { label: 'C' }, 2); await page.mouse.click(point.x, point.y, { button: 'right' }); @@ -293,7 +293,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-10082 Description: Opens right-click menu for bond */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); await selectLeftPanelButton(LeftPanelButton.S_Group, page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); @@ -306,7 +306,7 @@ test.describe('Right-click menu', () => { Test case: EPMLSOPKET-15495 Description: S-Group for Bond is attached. */ - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0); await page.mouse.click(point.x, point.y, { button: 'right' }); await page.getByText('Attach S-Group...', { exact: true }).click(); @@ -323,7 +323,7 @@ test.describe('Right-click menu', () => { Description: Three selected Carbon atoms changed to Nitrogen atoms. */ let point: { x: number; y: number }; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); point = await getAtomByIndex(page, { label: 'C' }, 1); await page.keyboard.down('Shift'); await page.mouse.click(point.x, point.y); @@ -341,14 +341,13 @@ test.describe('Right-click menu', () => { await pressButton(page, 'Apply'); }); - // it seems like the screenshot is being done too early - test.fixme('Multiple Bond editing by right-click menu', async ({ page }) => { + test('Multiple Bond editing by right-click menu', async ({ page }) => { /* Test case: EPMLSOPKET-15497 Description: Three selected Single Bonds changed to Double Bonds. */ let point: { x: number; y: number }; - await openFileAndAddToCanvas('Ket/chain.ket', page); + await openFileAndAddToCanvas('KET/chain.ket', page); point = await getBondByIndex(page, { type: BondType.SINGLE }, 1); await page.keyboard.down('Shift'); await page.mouse.click(point.x, point.y); diff --git a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Multiple-Bond-editing-by-right-click-menu-1-chromium-linux.png b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Multiple-Bond-editing-by-right-click-menu-1-chromium-linux.png index 8eea7ef8ec..539ee0120f 100644 Binary files a/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Multiple-Bond-editing-by-right-click-menu-1-chromium-linux.png and b/ketcher-autotests/tests/User-Interface/Right-Click-Menu/right-click.spec.ts-snapshots/Right-click-menu-Multiple-Bond-editing-by-right-click-menu-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/test-data/Ket/alias-pseudoatom.ket b/ketcher-autotests/tests/test-data/KET/alias-pseudoatom.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/alias-pseudoatom.ket rename to ketcher-autotests/tests/test-data/KET/alias-pseudoatom.ket diff --git a/ketcher-autotests/tests/test-data/Ket/all-atoms-properties.ket b/ketcher-autotests/tests/test-data/KET/all-atoms-properties.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/all-atoms-properties.ket rename to ketcher-autotests/tests/test-data/KET/all-atoms-properties.ket diff --git a/ketcher-autotests/tests/test-data/Ket/all-type-bonds.ket b/ketcher-autotests/tests/test-data/KET/all-type-bonds.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/all-type-bonds.ket rename to ketcher-autotests/tests/test-data/KET/all-type-bonds.ket diff --git a/ketcher-autotests/tests/test-data/Ket/atoms-and-bonds.ket b/ketcher-autotests/tests/test-data/KET/atoms-and-bonds.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/atoms-and-bonds.ket rename to ketcher-autotests/tests/test-data/KET/atoms-and-bonds.ket diff --git a/ketcher-autotests/tests/test-data/Ket/benzene-arrow-benzene-reagent-hcl.ket b/ketcher-autotests/tests/test-data/KET/benzene-arrow-benzene-reagent-hcl.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/benzene-arrow-benzene-reagent-hcl.ket rename to ketcher-autotests/tests/test-data/KET/benzene-arrow-benzene-reagent-hcl.ket diff --git a/ketcher-autotests/tests/test-data/Ket/benzene-arrow-benzene-reagent-nh3.ket b/ketcher-autotests/tests/test-data/KET/benzene-arrow-benzene-reagent-nh3.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/benzene-arrow-benzene-reagent-nh3.ket rename to ketcher-autotests/tests/test-data/KET/benzene-arrow-benzene-reagent-nh3.ket diff --git a/ketcher-autotests/tests/test-data/Ket/benzene-ring-with-two-atoms.ket b/ketcher-autotests/tests/test-data/KET/benzene-ring-with-two-atoms.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/benzene-ring-with-two-atoms.ket rename to ketcher-autotests/tests/test-data/KET/benzene-ring-with-two-atoms.ket diff --git a/ketcher-autotests/tests/test-data/Ket/benzene-with-data-s-group.ket b/ketcher-autotests/tests/test-data/KET/benzene-with-data-s-group.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/benzene-with-data-s-group.ket rename to ketcher-autotests/tests/test-data/KET/benzene-with-data-s-group.ket diff --git a/ketcher-autotests/tests/test-data/Ket/calculated-values-chain.ket b/ketcher-autotests/tests/test-data/KET/calculated-values-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/calculated-values-chain.ket rename to ketcher-autotests/tests/test-data/KET/calculated-values-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain-with-attachment-points.ket b/ketcher-autotests/tests/test-data/KET/chain-with-attachment-points.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain-with-attachment-points.ket rename to ketcher-autotests/tests/test-data/KET/chain-with-attachment-points.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain-with-name-and-value.ket b/ketcher-autotests/tests/test-data/KET/chain-with-name-and-value.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain-with-name-and-value.ket rename to ketcher-autotests/tests/test-data/KET/chain-with-name-and-value.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain-with-stereo-and-atoms.ket b/ketcher-autotests/tests/test-data/KET/chain-with-stereo-and-atoms.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain-with-stereo-and-atoms.ket rename to ketcher-autotests/tests/test-data/KET/chain-with-stereo-and-atoms.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain-with-stereo.ket b/ketcher-autotests/tests/test-data/KET/chain-with-stereo.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain-with-stereo.ket rename to ketcher-autotests/tests/test-data/KET/chain-with-stereo.ket diff --git a/ketcher-autotests/tests/test-data/Ket/chain.ket b/ketcher-autotests/tests/test-data/KET/chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/chain.ket rename to ketcher-autotests/tests/test-data/KET/chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/default-reaction-arrow-tool-saving.ket b/ketcher-autotests/tests/test-data/KET/default-reaction-arrow-tool-saving.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/default-reaction-arrow-tool-saving.ket rename to ketcher-autotests/tests/test-data/KET/default-reaction-arrow-tool-saving.ket diff --git a/ketcher-autotests/tests/test-data/Ket/different-marks-stereostructure.ket b/ketcher-autotests/tests/test-data/KET/different-marks-stereostructure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/different-marks-stereostructure.ket rename to ketcher-autotests/tests/test-data/KET/different-marks-stereostructure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/expanded-and-contracted-fg.ket b/ketcher-autotests/tests/test-data/KET/expanded-and-contracted-fg.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/expanded-and-contracted-fg.ket rename to ketcher-autotests/tests/test-data/KET/expanded-and-contracted-fg.ket diff --git a/ketcher-autotests/tests/test-data/Ket/ket-2934-to-compare-expected.ket b/ketcher-autotests/tests/test-data/KET/ket-2934-to-compare-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/ket-2934-to-compare-expected.ket rename to ketcher-autotests/tests/test-data/KET/ket-2934-to-compare-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/ket-ket-2934-to-compare.ket b/ketcher-autotests/tests/test-data/KET/ket-ket-2934-to-compare.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/ket-ket-2934-to-compare.ket rename to ketcher-autotests/tests/test-data/KET/ket-ket-2934-to-compare.ket diff --git a/ketcher-autotests/tests/test-data/Ket/ket-reagent-above-arrow-expected.ket b/ketcher-autotests/tests/test-data/KET/ket-reagent-above-arrow-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/ket-reagent-above-arrow-expected.ket rename to ketcher-autotests/tests/test-data/KET/ket-reagent-above-arrow-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-and-or-structure.ket b/ketcher-autotests/tests/test-data/KET/mixed-and-or-structure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-and-or-structure.ket rename to ketcher-autotests/tests/test-data/KET/mixed-and-or-structure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-and-stereomarks-expected.ket b/ketcher-autotests/tests/test-data/KET/mixed-and-stereomarks-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-and-stereomarks-expected.ket rename to ketcher-autotests/tests/test-data/KET/mixed-and-stereomarks-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-and-stereomarks.ket b/ketcher-autotests/tests/test-data/KET/mixed-and-stereomarks.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-and-stereomarks.ket rename to ketcher-autotests/tests/test-data/KET/mixed-and-stereomarks.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-or-stereomarks-expected.ket b/ketcher-autotests/tests/test-data/KET/mixed-or-stereomarks-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-or-stereomarks-expected.ket rename to ketcher-autotests/tests/test-data/KET/mixed-or-stereomarks-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-or-stereomarks.ket b/ketcher-autotests/tests/test-data/KET/mixed-or-stereomarks.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-or-stereomarks.ket rename to ketcher-autotests/tests/test-data/KET/mixed-or-stereomarks.ket diff --git a/ketcher-autotests/tests/test-data/Ket/mixed-with-eight-stereocenters.ket b/ketcher-autotests/tests/test-data/KET/mixed-with-eight-stereocenters.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/mixed-with-eight-stereocenters.ket rename to ketcher-autotests/tests/test-data/KET/mixed-with-eight-stereocenters.ket diff --git a/ketcher-autotests/tests/test-data/Ket/multiple-group-data.ket b/ketcher-autotests/tests/test-data/KET/multiple-group-data.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/multiple-group-data.ket rename to ketcher-autotests/tests/test-data/KET/multiple-group-data.ket diff --git a/ketcher-autotests/tests/test-data/Ket/multiple-group.ket b/ketcher-autotests/tests/test-data/KET/multiple-group.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/multiple-group.ket rename to ketcher-autotests/tests/test-data/KET/multiple-group.ket diff --git a/ketcher-autotests/tests/test-data/Ket/non-default-reaction-arrow-tool-saving.ket b/ketcher-autotests/tests/test-data/KET/non-default-reaction-arrow-tool-saving.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/non-default-reaction-arrow-tool-saving.ket rename to ketcher-autotests/tests/test-data/KET/non-default-reaction-arrow-tool-saving.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reaction-arrow.ket b/ketcher-autotests/tests/test-data/KET/reaction-arrow.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reaction-arrow.ket rename to ketcher-autotests/tests/test-data/KET/reaction-arrow.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reaction-chain.ket b/ketcher-autotests/tests/test-data/KET/reaction-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reaction-chain.ket rename to ketcher-autotests/tests/test-data/KET/reaction-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reaction-with-arrow-and-plus.ket b/ketcher-autotests/tests/test-data/KET/reaction-with-arrow-and-plus.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reaction-with-arrow-and-plus.ket rename to ketcher-autotests/tests/test-data/KET/reaction-with-arrow-and-plus.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reagent-hcl-text-below-arrow.ket b/ketcher-autotests/tests/test-data/KET/reagent-hcl-text-below-arrow.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reagent-hcl-text-below-arrow.ket rename to ketcher-autotests/tests/test-data/KET/reagent-hcl-text-below-arrow.ket diff --git a/ketcher-autotests/tests/test-data/Ket/reagent-nh3-text-above-arrow.ket b/ketcher-autotests/tests/test-data/KET/reagent-nh3-text-above-arrow.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/reagent-nh3-text-above-arrow.ket rename to ketcher-autotests/tests/test-data/KET/reagent-nh3-text-above-arrow.ket diff --git a/ketcher-autotests/tests/test-data/Ket/resizing-reaction-arrow-saving.ket b/ketcher-autotests/tests/test-data/KET/resizing-reaction-arrow-saving.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/resizing-reaction-arrow-saving.ket rename to ketcher-autotests/tests/test-data/KET/resizing-reaction-arrow-saving.ket diff --git a/ketcher-autotests/tests/test-data/Ket/simple-chain.ket b/ketcher-autotests/tests/test-data/KET/simple-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/simple-chain.ket rename to ketcher-autotests/tests/test-data/KET/simple-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/sru-polymer-data.ket b/ketcher-autotests/tests/test-data/KET/sru-polymer-data.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/sru-polymer-data.ket rename to ketcher-autotests/tests/test-data/KET/sru-polymer-data.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-and-structure-expected.ket b/ketcher-autotests/tests/test-data/KET/stereo-and-structure-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-and-structure-expected.ket rename to ketcher-autotests/tests/test-data/KET/stereo-and-structure-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-and-structure.ket b/ketcher-autotests/tests/test-data/KET/stereo-and-structure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-and-structure.ket rename to ketcher-autotests/tests/test-data/KET/stereo-and-structure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-mixed-structure-expected.ket b/ketcher-autotests/tests/test-data/KET/stereo-mixed-structure-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-mixed-structure-expected.ket rename to ketcher-autotests/tests/test-data/KET/stereo-mixed-structure-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-mixed-structure.ket b/ketcher-autotests/tests/test-data/KET/stereo-mixed-structure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-mixed-structure.ket rename to ketcher-autotests/tests/test-data/KET/stereo-mixed-structure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-or-structure-expected.ket b/ketcher-autotests/tests/test-data/KET/stereo-or-structure-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-or-structure-expected.ket rename to ketcher-autotests/tests/test-data/KET/stereo-or-structure-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-or-structure.ket b/ketcher-autotests/tests/test-data/KET/stereo-or-structure.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-or-structure.ket rename to ketcher-autotests/tests/test-data/KET/stereo-or-structure.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereo-test-structures.ket b/ketcher-autotests/tests/test-data/KET/stereo-test-structures.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereo-test-structures.ket rename to ketcher-autotests/tests/test-data/KET/stereo-test-structures.ket diff --git a/ketcher-autotests/tests/test-data/Ket/stereolabels.ket b/ketcher-autotests/tests/test-data/KET/stereolabels.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/stereolabels.ket rename to ketcher-autotests/tests/test-data/KET/stereolabels.ket diff --git a/ketcher-autotests/tests/test-data/Ket/structure-with-simple-objects-and-text.ket b/ketcher-autotests/tests/test-data/KET/structure-with-simple-objects-and-text.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/structure-with-simple-objects-and-text.ket rename to ketcher-autotests/tests/test-data/KET/structure-with-simple-objects-and-text.ket diff --git a/ketcher-autotests/tests/test-data/Ket/structure-with-stereo-bonds-expected.ket b/ketcher-autotests/tests/test-data/KET/structure-with-stereo-bonds-expected.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/structure-with-stereo-bonds-expected.ket rename to ketcher-autotests/tests/test-data/KET/structure-with-stereo-bonds-expected.ket diff --git a/ketcher-autotests/tests/test-data/Ket/structure-with-stereo-flags.ket b/ketcher-autotests/tests/test-data/KET/structure-with-stereo-flags.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/structure-with-stereo-flags.ket rename to ketcher-autotests/tests/test-data/KET/structure-with-stereo-flags.ket diff --git a/ketcher-autotests/tests/test-data/Ket/superatom-all-chain.ket b/ketcher-autotests/tests/test-data/KET/superatom-all-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/superatom-all-chain.ket rename to ketcher-autotests/tests/test-data/KET/superatom-all-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/superatom-one-atom-on-chain.ket b/ketcher-autotests/tests/test-data/KET/superatom-one-atom-on-chain.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/superatom-one-atom-on-chain.ket rename to ketcher-autotests/tests/test-data/KET/superatom-one-atom-on-chain.ket diff --git a/ketcher-autotests/tests/test-data/Ket/two-arrows-and-plus.ket b/ketcher-autotests/tests/test-data/KET/two-arrows-and-plus.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/two-arrows-and-plus.ket rename to ketcher-autotests/tests/test-data/KET/two-arrows-and-plus.ket diff --git a/ketcher-autotests/tests/test-data/Ket/two-atoms.ket b/ketcher-autotests/tests/test-data/KET/two-atoms.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/two-atoms.ket rename to ketcher-autotests/tests/test-data/KET/two-atoms.ket diff --git a/ketcher-autotests/tests/test-data/Ket/two-benzene-with-atoms.ket b/ketcher-autotests/tests/test-data/KET/two-benzene-with-atoms.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/two-benzene-with-atoms.ket rename to ketcher-autotests/tests/test-data/KET/two-benzene-with-atoms.ket diff --git a/ketcher-autotests/tests/test-data/Ket/utf-8-svg-png.ket b/ketcher-autotests/tests/test-data/KET/utf-8-svg-png.ket similarity index 100% rename from ketcher-autotests/tests/test-data/Ket/utf-8-svg-png.ket rename to ketcher-autotests/tests/test-data/KET/utf-8-svg-png.ket diff --git a/ketcher-autotests/tests/test-data/test-data-for-chiral-centersv2000.json b/ketcher-autotests/tests/test-data/Molfiles-V2000/test-data-for-chiral-centersv2000.mol similarity index 100% rename from ketcher-autotests/tests/test-data/test-data-for-chiral-centersv2000.json rename to ketcher-autotests/tests/test-data/Molfiles-V2000/test-data-for-chiral-centersv2000.mol diff --git a/ketcher-autotests/tests/test-data/test-data-for-chiral-centersv3000.json b/ketcher-autotests/tests/test-data/Molfiles-V3000/test-data-for-chiral-centersv3000.mol similarity index 100% rename from ketcher-autotests/tests/test-data/test-data-for-chiral-centersv3000.json rename to ketcher-autotests/tests/test-data/Molfiles-V3000/test-data-for-chiral-centersv3000.mol diff --git a/ketcher-autotests/tests/test-data/Rxn/reaction-2.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/reaction-2.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/Rxn/reaction-2.rxn rename to ketcher-autotests/tests/test-data/Rxn-V2000/reaction-2.rxn diff --git a/ketcher-autotests/tests/test-data/Rxn/reaction-3.rxn b/ketcher-autotests/tests/test-data/Rxn-V3000/reaction-3.rxn similarity index 100% rename from ketcher-autotests/tests/test-data/Rxn/reaction-3.rxn rename to ketcher-autotests/tests/test-data/Rxn-V3000/reaction-3.rxn diff --git a/ketcher-autotests/tests/test-data/chain-with-attachment-points-expected.mol b/ketcher-autotests/tests/test-data/chain-with-attachment-points-expected.mol index 6d45755af8..36a944d726 100644 --- a/ketcher-autotests/tests/test-data/chain-with-attachment-points-expected.mol +++ b/ketcher-autotests/tests/test-data/chain-with-attachment-points-expected.mol @@ -1,5 +1,5 @@ - -INDIGO-08212313212D + -INDIGO-09042315532D 8 7 0 0 0 0 0 0 0 0999 V2000 12.0439 -8.0500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expected.rxn b/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expected.rxn index f5c9f3ff2a..45cd299f56 100644 --- a/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expected.rxn +++ b/ketcher-autotests/tests/test-data/reaction-with-arrow-and-plus-expected.rxn @@ -1,11 +1,11 @@ $RXN - -INDIGO- 0821231321 + -INDIGO- 0904231553 1 2 $MOL - -INDIGO-08212313212D + -INDIGO-09042315532D 9 8 0 0 0 0 0 0 0 0999 V2000 5.8375 -8.1000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 @@ -28,14 +28,14 @@ $MOL M END $MOL - -INDIGO-08212313212D + -INDIGO-09042315532D 1 0 0 0 0 0 0 0 0 0999 V2000 24.3125 -8.0750 0.0000 Br 0 0 0 0 0 0 0 0 0 0 0 0 M END $MOL - -INDIGO-08212313212D + -INDIGO-09042315532D 6 5 0 0 0 0 0 0 0 0999 V2000 17.6420 -8.0000 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV3000.mol b/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV3000.mol index 3655c17ca2..8813dfa4b2 100644 --- a/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV3000.mol +++ b/ketcher-autotests/tests/test-data/structure-with-stereo-bonds-expectedV3000.mol @@ -1,5 +1,5 @@ - -INDIGO-08142315242D + -INDIGO-08312315162D 0 0 0 0 0 0 0 0 0 0 0 V3000 M V30 BEGIN CTAB diff --git a/ketcher-autotests/tests/utils/common/loaders/waitForIndigoToLoad.ts b/ketcher-autotests/tests/utils/common/loaders/waitForIndigoToLoad.ts index 5ae64e8111..201658bbed 100644 --- a/ketcher-autotests/tests/utils/common/loaders/waitForIndigoToLoad.ts +++ b/ketcher-autotests/tests/utils/common/loaders/waitForIndigoToLoad.ts @@ -1,5 +1,5 @@ import { Page, expect } from '@playwright/test'; export const waitForIndigoToLoad = async (page: Page) => { const someIndigoButton = await page.getByTitle('Aromatize (Alt+A)'); - await expect(someIndigoButton).toBeEnabled(); + await expect(someIndigoButton).toBeEnabled({ timeout: 20_000 }); }; diff --git a/ketcher-autotests/tests/utils/files/readFile.ts b/ketcher-autotests/tests/utils/files/readFile.ts index deadd175ae..434dd5b893 100644 --- a/ketcher-autotests/tests/utils/files/readFile.ts +++ b/ketcher-autotests/tests/utils/files/readFile.ts @@ -133,7 +133,7 @@ export async function saveToFile(filename: string, data: string) { } /* Example of usage: -await openFileAndAddToCanvas('Ket/benzene-arrow-benzene-reagent-hcl.ket', page); +await openFileAndAddToCanvas('KET/benzene-arrow-benzene-reagent-hcl.ket', page); const rxnFile = await getRxn(page, 'v3000'); await saveToFile('benzene-arrow-benzene-reagent-hcl.rxn', rxnFile); */ export async function pasteFromClipboard(page: Page, fillValue: string) { diff --git a/packages/ketcher-react/src/script/ui/component/form/colorPicker/ColorPicker.test.js b/packages/ketcher-react/src/script/ui/component/form/colorPicker/ColorPicker.test.js index b0ac116dd7..37802669d2 100644 --- a/packages/ketcher-react/src/script/ui/component/form/colorPicker/ColorPicker.test.js +++ b/packages/ketcher-react/src/script/ui/component/form/colorPicker/ColorPicker.test.js @@ -48,7 +48,7 @@ describe('should toggle color picker dialog', () => { setTimeout(() => { userEvent.click(overlay); resolve(); - }, 300); + }, 1000); }); expect(await screen.findByTestId('color-picker-field')).toBeInTheDocument();