Autotests: Fix tests (#3278)

* Added waitForRender * - updated snapshots; - deleted 'fixme' in few test 'copy-cut-paste'; --------- Co-authored-by: Mikhail Zhirnov <[email protected]>
epam · Sep 8, 2023 · 74390f5 · 74390f5
1 parent 046f7a7
commit 74390f5
Show file tree

Hide file tree

Showing 118 changed files with 375 additions and 246 deletions.
diff --git a/ketcher-autotests/playwright.config.ts b/ketcher-autotests/playwright.config.ts
@@ -67,7 +67,7 @@ const config: PlaywrightTestConfig = {
   /* Run tests in files in parallel */
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: Boolean(process.env.CI_ENVIRONMENT),
+  forbidOnly: isCI,
   /* Retry on CI only */
   retries: isCI ? MAX_NUMBER_OF_RETRIES : 0,
   /* Opt out of parallel tests on CI. */

diff --git a/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts b/ketcher-autotests/tests/API/api-set-get-molecule.spec.ts
@@ -10,7 +10,7 @@ import {
   receiveFileComparisonData,
   waitForSpinnerFinishedWork,
   clickInTheMiddleOfTheScreen,
-  waitForIndigoToLoad,
+  waitForPageInit,
 } from '@utils';
 import { getAtomByIndex } from '@utils/canvas/atoms';
 import {
@@ -31,8 +31,7 @@ function filteredFile(file: string, filteredIndex: number): string {
 
 test.describe('Tests for API setMolecule/getMolecule', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
-    await waitForIndigoToLoad(page);
+    await waitForPageInit(page);
   });
 
   test.afterEach(async ({ page }) => {

diff --git a/ketcher-autotests/tests/Examples/ketcher-api.spec.ts b/ketcher-autotests/tests/Examples/ketcher-api.spec.ts
@@ -1,9 +1,9 @@
 import { test, expect } from '@playwright/test';
 import { molV2000 } from '@tests/test-data/molV2000-result';
-import { clickInTheMiddleOfTheScreen } from '@utils';
+import { clickInTheMiddleOfTheScreen, waitForPageInit } from '@utils';
 
 test('getting molV2000 from Ketcher API', async ({ page }) => {
-  await page.goto('');
+  await waitForPageInit(page);
 
   await page.getByRole('button', { name: 'Benzene (T)' }).click();
 

diff --git a/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts b/ketcher-autotests/tests/Examples/ketcher-canvas.spec.ts
@@ -15,11 +15,12 @@ import {
   clickOnAtom,
   BondTool,
   selectNestedTool,
+  waitForPageInit,
 } from '@utils';
 
 test.describe('Drawing atom, Benzene ring, Single and Double Bond', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
   });
 
   test.afterEach(async ({ page }) => {

diff --git a/ketcher-autotests/tests/Examples/ketcher-files.spec.ts b/ketcher-autotests/tests/Examples/ketcher-files.spec.ts
@@ -1,8 +1,12 @@
 import { test } from '@playwright/test';
-import { takeEditorScreenshot, openFileAndAddToCanvas } from '@utils';
+import {
+  takeEditorScreenshot,
+  openFileAndAddToCanvas,
+  waitForPageInit,
+} from '@utils';
 
 test('opening molfile', async ({ page }) => {
-  await page.goto('');
+  await waitForPageInit(page);
   await openFileAndAddToCanvas('display-abbrev-groups-example.mol', page);
   await takeEditorScreenshot(page);
 });
@@ -11,7 +15,7 @@ test('opening rnx files', async ({ page }) => {
   /*
   Test case: EPMLSOPKET-1839
   */
-  await page.goto('');
+  await waitForPageInit(page);
   await openFileAndAddToCanvas('Rxn-V2000/1839-ketcher.rxn', page);
   await takeEditorScreenshot(page);
 });
@@ -20,7 +24,7 @@ test('opening smi files', async ({ page }) => {
   /*
   Test case: EPMLSOPKET-1840
   */
-  await page.goto('');
+  await waitForPageInit(page);
   await openFileAndAddToCanvas('SMILES/1840-cyclopentyl.smi', page);
   await takeEditorScreenshot(page);
 });
@@ -29,7 +33,7 @@ test('opening inchi files', async ({ page }) => {
   /*
   Test case: EPMLSOPKET-1841
   */
-  await page.goto('');
+  await waitForPageInit(page);
   await openFileAndAddToCanvas('InChI/1841-ketcher.inchi', page);
   await takeEditorScreenshot(page);
 });
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
@@ -6,13 +6,12 @@ import {
   openFileAndAddToCanvas,
   takeEditorScreenshot,
   pasteFromClipboardAndAddToCanvas,
-  waitForIndigoToLoad,
 } from '@utils';
+import { waitForPageInit } from '@utils/common/loaders/waitForPageInit';
 
 test.describe('CDX files', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
-    await waitForIndigoToLoad(page);
+    await waitForPageInit(page);
   });
 
   test.afterEach(async ({ page }) => {

diff --git a/...Open-And-Save-Files/CDXML-Enhanced-Stereochemistry/cdxml-enhanced-stereochemistry.spec.ts b/...Open-And-Save-Files/CDXML-Enhanced-Stereochemistry/cdxml-enhanced-stereochemistry.spec.ts
@@ -8,6 +8,7 @@ import {
   receiveFileComparisonData,
   saveToFile,
   clickOnAtom,
+  waitForPageInit,
 } from '@utils';
 import { getCdxml } from '@utils/formats';
 
@@ -24,7 +25,7 @@ async function selectRadioButtonForNewGroup(
 
 test.describe('CDXML Enhanced Stereochemistry', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
   });
 
   test.afterEach(async ({ page }) => {
@@ -78,7 +79,7 @@ test.describe('CDXML Enhanced Stereochemistry', () => {
 
 test.describe('CDXML Enhanced Stereochemistry', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
   });
 
   test('AND stereo marks - Save as *.cdxml file', async ({ page }) => {

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
@@ -6,8 +6,8 @@ import {
   openFileAndAddToCanvas,
   saveToFile,
   delay,
-  waitForIndigoToLoad,
 } from '@utils';
+import { waitForPageInit } from '@utils/common/loaders/waitForPageInit';
 import { getCml } from '@utils/formats';
 
 async function openFileAddToCanvasTakeScreenshot(page: Page, fileName: string) {
@@ -17,8 +17,7 @@ async function openFileAddToCanvasTakeScreenshot(page: Page, fileName: string) {
 
 test.describe('CML files', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
-    await waitForIndigoToLoad(page);
+    await waitForPageInit(page);
   });
 
   test('Open and Save files - CML - CML for empty canvas', async ({ page }) => {

diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/InChi/InChi.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/InChi/InChi.spec.ts
@@ -5,11 +5,12 @@ import {
   openFromFileViaClipboard,
   selectTopPanelButton,
   TopPanelButton,
+  waitForPageInit,
 } from '@utils';
 
 test.describe('', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
   });
 
   test.afterEach(async ({ page }) => {

diff --git a/...utotests/tests/File-Management/Open-And-Save-Files/KET-Files/ket-files-properties.spec.ts b/...utotests/tests/File-Management/Open-And-Save-Files/KET-Files/ket-files-properties.spec.ts
@@ -4,13 +4,14 @@ import {
   openFileAndAddToCanvas,
   receiveFileComparisonData,
   saveToFile,
+  waitForPageInit,
 } from '@utils';
 import { getKet } from '@utils/formats';
 
 test('Open KET file with properties and check properties are saved in struct', async ({
   page,
 }) => {
-  await page.goto('');
+  await waitForPageInit(page);
 
   await openFileAndAddToCanvas('KET/ket-with-properties.ket', page);
 
@@ -43,7 +44,7 @@ test('Open KET file with properties and check properties are saved in struct', a
 });
 
 test('Save a structure with properties to KET format', async ({ page }) => {
-  await page.goto('');
+  await waitForPageInit(page);
 
   await openFileAndAddToCanvas('KET/ket-with-properties.ket', page);