#3174 - RNA Bases are filtered wrong

ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-add-to-canvas.spec.ts

@@ -1,5 +1,9 @@
 import { test } from '@playwright/test';
-import { clickInTheMiddleOfTheScreen, waitForPageInit } from '@utils';
+import {
+  clickInTheMiddleOfTheScreen,
+  takePageScreenshot,
+  waitForPageInit,
+} from '@utils';
 import { POLYMER_TOGGLER } from '../../../constants/testIdConstants';
 
 /* 
@@ -20,9 +24,5 @@ test('Select chem and drag it to canvas', async ({ page }) => {
   // Click on <svg> #polymer-editor-canvas
   await clickInTheMiddleOfTheScreen(page);
 
-  // Take full page screenshot
-  await page.screenshot({
-    path: 'tests/Macromolecule-editor/screenshots/chem-add-to-canvas.png',
-    fullPage: true,
-  });
+  await takePageScreenshot(page);
 });

ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts

@@ -1,11 +1,13 @@
 import { test, expect } from '@playwright/test';
 import { POLYMER_TOGGLER } from '../../../constants/testIdConstants';
 import { waitForPageInit } from '@utils/common';
+import { takePageScreenshot } from '@utils';
 
 test.describe('Open Ketcher', () => {
   test.beforeEach(async ({ page }) => {
     await waitForPageInit(page);
   });
+
   test('Switch to Polymer Editor', async ({ page }) => {
     /* 
     Test case: #2496 - chem monomer library
@@ -25,8 +27,6 @@ test.describe('Open Ketcher', () => {
     await page.getByTestId(POLYMER_TOGGLER).click();
     await page.getByText('CHEM').click();
     await expect(page.getByText('A6OH')).toBeVisible();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/chem-library.png',
-    });
+    await takePageScreenshot(page);
   });
 });

ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts

@@ -4,16 +4,18 @@ import {
   selectEraseTool,
   selectSingleBondTool,
   takeEditorScreenshot,
+  waitForPageInit,
 } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
 /* eslint-disable no-magic-numbers */
 
 test.describe('Erase Tool', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
     await turnOnMacromoleculesEditor(page);
   });
+
   test('Delete monomer bonded with another monomers', async ({ page }) => {
     /* 
     Test case: #2370 - "Erase" tool for macromolecules editor

ketcher-autotests/tests/Macromolecule-editor/Favorites/favorites-add-to-canvas.spec.ts

@@ -1,25 +1,25 @@
 import { test } from '@playwright/test';
-import { POLYMER_TOGGLER } from '@constants/testIdConstants';
 import {
   clickInTheMiddleOfTheScreen,
-  takePolymerEditorScreenshot,
+  takePageScreenshot,
   waitForPageInit,
 } from '@utils';
 import {
   ALANINE,
   getFavoriteButtonSelector,
 } from '@utils/selectors/macromoleculeEditor';
+import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 
 test('Add molecule to favorites, switch to Favorites tab and drag it to the canvas', async ({
   page,
 }) => {
   await waitForPageInit(page);
+  await turnOnMacromoleculesEditor(page);
 
-  await page.getByTestId(POLYMER_TOGGLER).click();
   await page.click(getFavoriteButtonSelector(ALANINE));
   await page.getByText('Favorites').click();
   await page.click(ALANINE);
   await clickInTheMiddleOfTheScreen(page);
 
-  await takePolymerEditorScreenshot(page);
+  await takePageScreenshot(page);
 });

ketcher-autotests/tests/Macromolecule-editor/Ket/ket-deserialize.spec.ts

@@ -1,12 +1,17 @@
 import { test } from '@playwright/test';
-import { openFileAndAddToCanvas, takeEditorScreenshot } from '@utils';
+import {
+  openFileAndAddToCanvas,
+  takeEditorScreenshot,
+  waitForPageInit,
+} from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 
 test.describe('Ket Deserialize', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
     await turnOnMacromoleculesEditor(page);
   });
+
   test('Open ket file with monomers and bonds', async ({ page }) => {
     /* 
     Test case: #3230 - Support parsing KET file for macromolecules on ketcher side

ketcher-autotests/tests/Macromolecule-editor/Peptides/peptides-add-to-canvas.spec.ts

@@ -1,27 +1,22 @@
 import { test } from '@playwright/test';
-import { clickInTheMiddleOfTheScreen, waitForPageInit } from '@utils';
+import {
+  clickInTheMiddleOfTheScreen,
+  takePageScreenshot,
+  waitForPageInit,
+} from '@utils';
 import { ALANINE } from '@utils/selectors/macromoleculeEditor';
-import { POLYMER_TOGGLER } from '../../../constants/testIdConstants';
+import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 
 /* 
 Test case: #3063 - Add e2e tests for Macromolecule editor
 */
 
 test('Select peptide and drag it to canvas', async ({ page }) => {
   await waitForPageInit(page);
+  await turnOnMacromoleculesEditor(page);
 
-  // Click on POLYMER_TOGGLER
-  await page.getByTestId(POLYMER_TOGGLER).click();
-
-  // Click on <div> "A ★"
   await page.click(ALANINE);
-
-  // Click on <svg> #polymer-editor-canvas
   await clickInTheMiddleOfTheScreen(page);
 
-  // Take full page screenshot
-  await page.screenshot({
-    path: 'tests/Macromolecule-editor/screenshots/peptides-add-to-canvas.png',
-    fullPage: true,
-  });
+  await takePageScreenshot(page);
 });

ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/attachment-point-rotation.spec.ts

@@ -4,14 +4,16 @@ import {
   dragMouseTo,
   selectRectangleSelectionTool,
   selectSingleBondTool,
+  takePageScreenshot,
+  waitForPageInit,
 } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 import { bondTwoMonomers } from '@utils/macromolecules/polymerBond';
 /* eslint-disable no-magic-numbers */
 
 test.describe('Check attachment point rotation', () => {
   test.beforeEach(async ({ page }) => {
-    await page.goto('');
+    await waitForPageInit(page);
     await turnOnMacromoleculesEditor(page);
   });
   test('Select monomer and bonds and then hover monomer', async ({ page }) => {
@@ -46,16 +48,12 @@ test.describe('Check attachment point rotation', () => {
     // Hover 1th peptide
     await peptide1.hover();
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/attachment-point-rotation-1.png',
-    });
+    await takePageScreenshot(page);
 
     // Hover 2nd peptide
     await peptide2.hover();
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/attachment-point-rotation-2.png',
-    });
+    await takePageScreenshot(page);
   });
 
   test('Move monomer bonded with another monomers and check attachment points', async ({
@@ -87,9 +85,7 @@ test.describe('Check attachment point rotation', () => {
     // Hover 1th peptide
     await peptide1.hover();
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/attachment-point-rotation-3.png',
-    });
+    await takePageScreenshot(page);
 
     // Move selected monomer
     await selectRectangleSelectionTool(page);
@@ -102,8 +98,6 @@ test.describe('Check attachment point rotation', () => {
     // Hover 1th peptide
     await peptide1.hover();
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/attachment-point-rotation-4.png',
-    });
+    await takePageScreenshot(page);
   });
 });

ketcher-autotests/tests/Macromolecule-editor/Polymer-Bond-Tool/polymer-bond-tool.spec.ts

@@ -1,20 +1,22 @@
 import { test } from '@playwright/test';
-import { selectSingleBondTool, waitForPageInit } from '@utils';
+import {
+  selectSingleBondTool,
+  waitForPageInit,
+  takePageScreenshot,
+} from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 /* eslint-disable no-magic-numbers */
 
 test.describe('Polymer Bond Tool', () => {
   test.beforeEach(async ({ page }) => {
     await waitForPageInit(page);
+    await turnOnMacromoleculesEditor(page);
   });
   test('Create bond between two peptides', async ({ page }) => {
     /* 
     Test case: #2334 - Create peptide chain (HELM style) - Center-to-Center
     Description: Polymer bond tool
     */
-
-    await turnOnMacromoleculesEditor(page);
-
     // Choose peptide
     await page.getByText('Tza').click();
 
@@ -37,14 +39,11 @@ test.describe('Polymer Bond Tool', () => {
     // Create bonds between peptides, taking screenshots in middle states
     await peptide1.hover();
     await page.mouse.down();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool.png',
-    });
+
+    await takePageScreenshot(page);
     await peptide2.hover();
     await page.mouse.up();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool2.png',
-    });
+    await takePageScreenshot(page);
 
     await page.mouse.down();
     await peptide3.hover();
@@ -58,19 +57,14 @@ test.describe('Polymer Bond Tool', () => {
     // Wait error popup
     await page.waitForSelector('#error-tooltip');
 
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool3.png',
-    });
+    await takePageScreenshot(page);
   });
 
   test('Create bond between two chems', async ({ page }) => {
     /* 
     Test case: #2497 - Adding chems to canvas - Center-to-Center
     Description: Polymer bond tool
     */
-
-    await turnOnMacromoleculesEditor(page);
-
     // Choose chems
     await page.getByText('CHEM').click();
     await page.getByTestId('hxy___Hexynyl alcohol').click();
@@ -90,13 +84,10 @@ test.describe('Polymer Bond Tool', () => {
     // Create bonds between chems, taking screenshots in middle states
     await chem1.hover();
     await page.mouse.down();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem1.png',
-    });
+    await takePageScreenshot(page);
     await chem2.hover();
     await page.mouse.up();
-    await page.screenshot({
-      path: 'tests/Macromolecule-editor/screenshots/polymer-bond-tool-chem2.png',
-    });
+
+    await takePageScreenshot(page);
   });
 });