Merge branches '6003-autotests-allow-import-and-export-of-sequences-w…

…ith-three-letter-amino-acid-codes' and 'master' of https://github.com/epam/ketcher into 6003-autotests-allow-import-and-export-of-sequences-with-three-letter-amino-acid-codes
epam · Nov 26, 2024 · cb37c2a · cb37c2a
2 parents 2a46027 + e94634f
commit cb37c2a
Show file tree

Hide file tree

Showing 88 changed files with 521 additions and 458 deletions.
diff --git a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts
@@ -13,6 +13,7 @@ import {
   openFileAndAddToCanvasAsNewProject,
   drawBenzeneRing,
   waitForLoad,
+  clickOnCanvas,
 } from '@utils';
 import { getAtomByIndex } from '@utils/canvas/atoms';
 import {
@@ -364,7 +365,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
 
     // 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 clickOnCanvas(page, point.x, point.y, { button: 'right' });
     await page.getByText('Contract Abbreviation').click();
     await takeEditorScreenshot(page);
   });
@@ -411,7 +412,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
 
     // 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 clickOnCanvas(page, point.x, point.y, { button: 'right' });
     await page.getByText('Contract Abbreviation').click();
     await takeEditorScreenshot(page);
   });
@@ -497,7 +498,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
 
     // 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 clickOnCanvas(page, point.x, point.y, { button: 'right' });
     await page.getByText('Contract Abbreviation').click();
     await takeEditorScreenshot(page);
   });
@@ -544,7 +545,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
 
     // 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 clickOnCanvas(page, point.x, point.y, { button: 'right' });
     await page.getByText('Contract Abbreviation').click();
     await takeEditorScreenshot(page);
   });
@@ -627,7 +628,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
 
     // 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 clickOnCanvas(page, point.x, point.y, { button: 'right' });
     await page.getByText('Contract Abbreviation').click();
     await takeEditorScreenshot(page);
   });
@@ -671,7 +672,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
 
     // 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 clickOnCanvas(page, point.x, point.y, { button: 'right' });
     await page.getByText('Contract Abbreviation').click();
     await takeEditorScreenshot(page);
   });

diff --git a/ketcher-autotests/tests/API/view-only-mode.spec.ts b/ketcher-autotests/tests/API/view-only-mode.spec.ts
@@ -24,6 +24,7 @@ import {
   dragMouseTo,
   selectAllStructuresOnCanvas,
   pasteFromClipboardByKeyboard,
+  clickOnCanvas,
 } from '@utils';
 import { closeErrorAndInfoModals } from '@utils/common/helpers';
 import {
@@ -194,7 +195,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
     await page.getByTitle('Copy as MOL (Ctrl+M)').click();
     await disableViewOnlyModeBySetOptions(page);
     await pasteFromClipboardByKeyboard(page);
-    await page.mouse.click(200, 200);
+    await clickOnCanvas(page, 200, 200);
     await takeEditorScreenshot(page);
   });
 
@@ -213,7 +214,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
     await page.getByTitle('Copy as KET (Ctrl+Shift+K)').click();
     await disableViewOnlyModeBySetOptions(page);
     await pasteFromClipboardByKeyboard(page);
-    await page.mouse.click(200, 200);
+    await clickOnCanvas(page, 200, 200);
     await takeEditorScreenshot(page);
   });
 

diff --git a/...s/tests/File-Management/Open-And-Save-Files/Open-File/Load-Fragment/load-fragment.spec.ts b/...s/tests/File-Management/Open-And-Save-Files/Open-File/Load-Fragment/load-fragment.spec.ts
@@ -18,6 +18,7 @@ import {
   receiveFileComparisonData,
   saveToFile,
   moveOnAtom,
+  clickOnCanvas,
 } from '@utils';
 import { getKet } from '@utils/formats';
 
@@ -197,7 +198,7 @@ test.describe('load as fragment (Add to Canvas) srtuctures from files with diffe
 
     async function addSecondHydrogen() {
       await selectAtomInToolbar(AtomButton.Hydrogen, page);
-      await page.mouse.click(x + shiftForSecondHydrogen, y, {
+      await clickOnCanvas(page, x + shiftForSecondHydrogen, y, {
         button: 'left',
       });
     }

diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Rxn-Files/rxn-files.spec.ts
@@ -29,6 +29,7 @@ import {
   setBondLengthOptionUnit,
   setBondLengthValue,
   openSettings,
+  clickOnCanvas,
 } from '@utils';
 import { getRxn } from '@utils/formats';
 import { drawReactionWithTwoBenzeneRings } from '@utils/canvas/drawStructures';
@@ -104,7 +105,7 @@ test.describe('Tests for Open and Save RXN file operations', () => {
     await page.getByRole('button', { name: 'Cancel' }).click();
     await selectNestedTool(page, RgroupTool.R_GROUP_FRAGMENT);
     const { x, y } = await getCoordinatesTopAtomOfBenzeneRing(page);
-    await page.mouse.click(x, y);
+    await clickOnCanvas(page, x, y);
     await page.getByRole('button', { name: 'R22' }).click();
     await page.getByRole('button', { name: 'Apply' }).click();
     await selectTopPanelButton(TopPanelButton.Save, page);
@@ -161,7 +162,7 @@ test.describe('Tests for Open and Save RXN file operations', () => {
 
     await pressButton(page, 'Cancel');
     await selectLeftPanelButton(LeftPanelButton.ReactionPlusTool, page);
-    await page.mouse.click(xCoordinatesWithShiftHalf, yCoordinatesWithShift);
+    await clickOnCanvas(page, xCoordinatesWithShiftHalf, yCoordinatesWithShift);
     const ySecondChain = yCoordinatesWithShift + yDelta50;
     await selectLeftPanelButton(LeftPanelButton.Chain, page);
     await page.mouse.move(x, ySecondChain);
@@ -170,7 +171,7 @@ test.describe('Tests for Open and Save RXN file operations', () => {
 
     await pressButton(page, 'Cancel');
     await selectLeftPanelButton(LeftPanelButton.Erase, page);
-    await page.mouse.click(xCoordinatesWithShiftHalf, yCoordinatesWithShift);
+    await clickOnCanvas(page, xCoordinatesWithShiftHalf, yCoordinatesWithShift);
     await selectNestedTool(page, ArrowTool.ARROW_FILLED_BOW);
     const yArrowStart = y + yDelta20;
     const yArrowEnd = yArrowStart + yDelta20;

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
@@ -18,6 +18,7 @@ import {
   waitForSpinnerFinishedWork,
   waitForPageInit,
   openFileAndAddToCanvasAsNewProject,
+  clickOnCanvas,
 } from '@utils';
 import { getCml, getMolfile, getRxn, getSmiles } from '@utils/formats';
 import {
@@ -164,7 +165,7 @@ test.describe('Aromatize/Dearomatize Tool', () => {
       page,
     );
     await copyAndPaste(page);
-    await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y);
+    await clickOnCanvas(page, CANVAS_CLICK_X, CANVAS_CLICK_Y);
     await waitForSpinnerFinishedWork(page, async () => {
       await selectTopPanelButton(TopPanelButton.Aromatize, page);
     });
@@ -184,7 +185,7 @@ test.describe('Aromatize/Dearomatize Tool', () => {
       page,
     );
     await cutAndPaste(page);
-    await page.mouse.click(CANVAS_CLICK_X, CANVAS_CLICK_Y);
+    await clickOnCanvas(page, CANVAS_CLICK_X, CANVAS_CLICK_Y);
     await waitForSpinnerFinishedWork(page, async () => {
       await selectTopPanelButton(TopPanelButton.Aromatize, page);
     });

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
@@ -26,6 +26,7 @@ import {
   clickOnBond,
   openFileAndAddToCanvasAsNewProject,
   selectAllStructuresOnCanvas,
+  clickOnCanvas,
 } from '@utils';
 import { getAtomByIndex } from '@utils/canvas/atoms';
 import { getBondByIndex } from '@utils/canvas/bonds';
@@ -122,9 +123,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => {
     );
     await selectTopPanelButton(TopPanelButton.Calculate, page);
     await copyAndPaste(page);
-    await waitForRender(page, async () => {
-      await page.mouse.click(x, y);
-    });
+    await clickOnCanvas(page, x, y);
     await takeEditorScreenshot(page);
   });
 
@@ -144,7 +143,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => {
     );
     await selectTopPanelButton(TopPanelButton.Calculate, page);
     await cutAndPaste(page);
-    await page.mouse.click(x, y);
+    await clickOnCanvas(page, x, y);
     await takeEditorScreenshot(page);
   });
 
@@ -368,7 +367,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => {
     await selectTopPanelButton(TopPanelButton.Calculate, page);
     await selectLeftPanelButton(LeftPanelButton.Erase, page);
     const point = await getAtomByIndex(page, { label: 'N' }, 0);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
 
     await takeEditorScreenshot(page);
 
@@ -425,7 +424,7 @@ test.describe('Indigo Tools - Calculate CIP Tool', () => {
     });
     await selectNestedTool(page, BondTool.UP);
     const point = await getBondByIndex(page, { type: BondType.SINGLE }, 5);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     await takeEditorScreenshot(page);
   });
 

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
@@ -15,6 +15,7 @@ import {
   AtomButton,
   waitForPageInit,
   waitForSpinnerFinishedWork,
+  clickOnCanvas,
 } from '@utils';
 import { getAtomByIndex } from '@utils/canvas/atoms';
 import { getBondByIndex } from '@utils/canvas/bonds';
@@ -127,11 +128,11 @@ test.describe('Calculated Values Tools', () => {
 
     point = await getBondByIndex(page, { type: BondType.SINGLE }, 3);
     await page.keyboard.down('Shift');
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     point = await getBondByIndex(page, { type: BondType.SINGLE }, 4);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     point = await getBondByIndex(page, { type: BondType.SINGLE }, 5);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     await page.keyboard.up('Shift');
 
     await waitForSpinnerFinishedWork(page, async () => {
@@ -494,7 +495,7 @@ test.describe('Calculated Values Tools', () => {
     */
     await openFileAndAddToCanvas('Molfiles-V3000/a-query-non-hsub.mol', page);
     const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     await selectTopPanelButton(TopPanelButton.Calculated, page);
     await takeEditorScreenshot(page);
   });
@@ -512,7 +513,7 @@ test.describe('Calculated Values Tools', () => {
       page,
     );
     const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     await selectTopPanelButton(TopPanelButton.Calculated, page);
     await takeEditorScreenshot(page);
   });
@@ -527,7 +528,7 @@ test.describe('Calculated Values Tools', () => {
     */
     await openFileAndAddToCanvas('Molfiles-V3000/a-query-ring-bonds.mol', page);
     const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     await selectTopPanelButton(TopPanelButton.Calculated, page);
     await takeEditorScreenshot(page);
   });
@@ -542,7 +543,7 @@ test.describe('Calculated Values Tools', () => {
     */
     await openFileAndAddToCanvas('Molfiles-V3000/a-query-aq.mol', page);
     const point = await getBondByIndex(page, { type: BondType.SINGLE }, 0);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     await selectTopPanelButton(TopPanelButton.Calculated, page);
     await takeEditorScreenshot(page);
   });
@@ -557,7 +558,7 @@ test.describe('Calculated Values Tools', () => {
     */
     await openFileAndAddToCanvas('Molfiles-V3000/a-query-atom-list.mol', page);
     const point = await getAtomByIndex(page, { label: 'C' }, 0);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     await selectTopPanelButton(TopPanelButton.Calculated, page);
     await takeEditorScreenshot(page);
   });
@@ -572,7 +573,7 @@ test.describe('Calculated Values Tools', () => {
     */
     await openFileAndAddToCanvas('Molfiles-V3000/a-query-not-list.mol', page);
     const point = await getAtomByIndex(page, { label: 'C' }, 0);
-    await page.mouse.click(point.x, point.y);
+    await clickOnCanvas(page, point.x, point.y);
     await selectTopPanelButton(TopPanelButton.Calculated, page);
     await takeEditorScreenshot(page);
   });

diff --git a/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts b/ketcher-autotests/tests/Indigo-Tools/Layout/layout.spec.ts
@@ -18,6 +18,7 @@ import {
   takeTopToolbarScreenshot,
   selectPartOfMolecules,
   selectPartOfChain,
+  clickOnCanvas,
 } from '@utils';
 
 async function openFileWithShift(filename: string, page: Page) {
@@ -28,7 +29,7 @@ async function openFileWithShift(filename: string, page: Page) {
   });
   const { x, y } = await getCoordinatesOfTheMiddleOfTheScreen(page);
   const shift = 150;
-  await page.mouse.click(x + shift, y + shift);
+  await clickOnCanvas(page, x + shift, y + shift);
 }
 
 test.describe('Indigo Tools - Layout', () => {