#4701 - Unify toolbars with small molecules mode

epam · May 31, 2024 · 2586f9a · 2586f9a
1 parent eb9de63
commit 2586f9a
Show file tree

Hide file tree

Showing 86 changed files with 829 additions and 318 deletions.
diff --git a/ketcher-autotests/tests/Macromolecule-editor/API-Macro/add-fragment.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/API-Macro/add-fragment.spec.ts
@@ -10,6 +10,7 @@ import {
   openFileAndAddToCanvasMacro,
   dragMouseTo,
   waitForRender,
+  clickInTheMiddleOfTheScreen,
 } from '@utils';
 
 const fileName = 'KET/alanine-monomers-bonded.ket';
@@ -52,11 +53,13 @@ test.describe('addFragment', () => {
       async () => await addFragment(page, fileContents),
     );
     const numberOfPressZoomOut = 6;
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomOut; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
   });
 
   test('ket with two monomers bonded', async ({ page }) => {
@@ -66,10 +69,12 @@ test.describe('addFragment', () => {
       async () => await addFragment(page, fileContents),
     );
     const numberOfPressZoomOut = 6;
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomOut; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
   });
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/API-Macro/set-mode.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/API-Macro/set-mode.spec.ts
@@ -8,6 +8,7 @@ import {
   selectSnakeLayoutModeTool,
   takeEditorScreenshot,
   setZoom,
+  moveMouseAway,
 } from '@utils';
 
 test.describe('setMode', () => {
@@ -32,6 +33,7 @@ test.describe('setMode', () => {
     await selectSnakeLayoutModeTool(page);
     await takeEditorScreenshot(page);
     await setMode(page, 'flex');
+    await moveMouseAway(page);
     await takeEditorScreenshot(page);
   });
 

diff --git a/...et-mode.spec.ts-snapshots/setMode-Should-set-sequence-mode-1-chromium-linux.png b/...et-mode.spec.ts-snapshots/setMode-Should-set-sequence-mode-1-chromium-linux.png
diff --git a/...et-mode.spec.ts-snapshots/setMode-Should-set-sequence-mode-2-chromium-linux.png b/...et-mode.spec.ts-snapshots/setMode-Should-set-sequence-mode-2-chromium-linux.png
diff --git a/ketcher-autotests/tests/Macromolecule-editor/API-Macro/set-molecule.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/API-Macro/set-molecule.spec.ts
@@ -7,6 +7,7 @@ import {
   takeEditorScreenshot,
   waitForSpinnerFinishedWork,
   waitForRender,
+  clickInTheMiddleOfTheScreen,
 } from '@utils';
 
 test.describe('setMolecule', () => {
@@ -24,11 +25,13 @@ test.describe('setMolecule', () => {
       async () => await setMolecule(page, fileContents),
     );
     const numberOfPressZoomOut = 6;
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomOut; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 
@@ -41,11 +44,13 @@ test.describe('setMolecule', () => {
       async () => await setMolecule(page, fileContents),
     );
     const numberOfPressZoomOut = 6;
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomOut; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/API-Macro/set-zoom.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/API-Macro/set-zoom.spec.ts
@@ -6,6 +6,7 @@ import {
   turnOnMacromoleculesEditor,
   openFileAndAddToCanvasMacro,
   setZoom,
+  clickInTheMiddleOfTheScreen,
 } from '@utils';
 
 test.describe('setZoom', () => {
@@ -36,9 +37,11 @@ test.describe('setZoom', () => {
       await takeEditorScreenshot(page);
 
       if (adjustZoom) {
+        await page.getByTestId('zoom-selector').click();
         for (let i = 0; i < 3; i++) {
           await page.getByTestId('zoom-in-button').click();
         }
+        await clickInTheMiddleOfTheScreen(page);
         await takeEditorScreenshot(page);
       }
 

diff --git a/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Chem-monomers/chem-library.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { waitForPageInit } from '@utils/common';
-import { takePageScreenshot } from '@utils';
+import { takeMonomerLibraryScreenshot } from '@utils';
 import { turnOnMacromoleculesEditor } from '@utils/macromolecules';
 
 test.describe('Open Ketcher', () => {
@@ -24,6 +24,6 @@ test.describe('Open Ketcher', () => {
     */
     await page.getByText('CHEM').click();
     await expect(page.getByText('A6OH')).toBeVisible();
-    await takePageScreenshot(page);
+    await takeMonomerLibraryScreenshot(page);
   });
 });
diff --git a/...ry.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png b/...ry.spec.ts-snapshots/Open-Ketcher-Open-Chem-tab-in-library-1-chromium-linux.png
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Copy-And-Paste/sequence-mode-copy-paste.spec.ts
@@ -14,6 +14,7 @@ import {
   readFileContents,
   startNewSequence,
   selectSnakeLayoutModeTool,
+  waitForRender,
   // waitForRender,
 } from '@utils';
 import {
@@ -307,8 +308,11 @@ test.describe('Sequence-edit mode', () => {
     await clickOnSequenceSymbol(page, 'G');
     await page.keyboard.press('ArrowLeft');
     await page.keyboard.press('Control+v');
-    await takeEditorScreenshot(page);
+    await waitForRender(page, async () => {
+      await takeEditorScreenshot(page);
+    });
     await selectSnakeLayoutModeTool(page);
+    await moveMouseAway(page);
     await takeEditorScreenshot(page);
   });
 });
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Erase-Tool/erase-tool.spec.ts
@@ -320,18 +320,22 @@ test.describe('Erase Tool', () => {
       page,
     );
     await selectEraseTool(page);
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < 5; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-in-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await page.getByText('Bal').locator('..').first().click();
     await takeEditorScreenshot(page);
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < 8; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await page.getByText('D-2Nal').locator('..').first().click();
     await takeEditorScreenshot(page);
   });

diff --git a/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-1-chromium-linux.png b/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-1-chromium-linux.png
diff --git a/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-2-chromium-linux.png b/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-2-chromium-linux.png
diff --git a/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-3-chromium-linux.png b/...Rectangle-with-Shift-Tab-and-Erase-tool-with-Del-Backspace-3-chromium-linux.png
diff --git a/...emovin-c62c9--selection-tool-not-switches-to-deletion-tool-2-chromium-linux.png b/...emovin-c62c9--selection-tool-not-switches-to-deletion-tool-2-chromium-linux.png
diff --git a/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-fasta.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-fasta.spec.ts
@@ -119,6 +119,7 @@ test.describe('Import-Saving .fasta Files', () => {
   }) => {
     await openFileAndAddToCanvasMacro('FASTA/fasta-snake-mode-rna.fasta', page);
     await selectSnakeLayoutModeTool(page);
+    await moveMouseAway(page);
     await takeEditorScreenshot(page);
   });
 
@@ -294,6 +295,7 @@ test.describe('Import-Saving .fasta Files', () => {
   //   await pressButton(page, 'Add to Canvas');
   //   await takeEditorScreenshot(page);
   //   await selectSequenceLayoutModeTool(page);
+  //   await moveMouseAway(page);
   //   await takeEditorScreenshot(page);
   // });
 

diff --git a/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-ket.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-ket.spec.ts
@@ -60,11 +60,13 @@ test.describe('Import-Saving .ket Files', () => {
     expect(ketFile).toEqual(ketFileExpected);
 
     const numberOfPressZoomOut = 6;
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomOut; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 
@@ -87,11 +89,13 @@ test.describe('Import-Saving .ket Files', () => {
     expect(ketFile).toEqual(ketFileExpected);
 
     const numberOfPressZoomOut = 7;
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomOut; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 

diff --git a/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-mol.spec.ts b/ketcher-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-mol.spec.ts
@@ -16,8 +16,8 @@ import {
   receiveFileComparisonData,
   waitForRender,
   selectEraseTool,
-  selectOptionInDropdown,
-  pressButton,
+  // selectOptionInDropdown,
+  // pressButton,
   selectSnakeLayoutModeTool,
   turnOnMicromoleculesEditor,
   selectClearCanvasTool,
@@ -222,11 +222,13 @@ test.describe('Import-Saving .mol Files', () => {
     expect(molFile).toEqual(molFileExpected);
 
     const numberOfPressZoomOut = 6;
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomOut; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 
@@ -321,28 +323,27 @@ test.describe('Import-Saving .mol Files', () => {
     await turnOnMacromoleculesEditor(page);
   });
 
-  test('Check that system does not let uploading corrupted .mol file', async () => {
-    /*
-    Test case: Import/Saving files
-    Description: System does not let uploading corrupted .mol file
-    */
-    // Fail while performance issue on Indigo side
-    test.fail();
-    await selectTopPanelButton(TopPanelButton.Open, page);
-
-    const filename = 'Molfiles-V3000/corrupted-file.mol';
-    await openFile(filename, page);
-    await selectOptionInDropdown(filename, page);
-    await pressButton(page, 'Add to Canvas');
-    await takeEditorScreenshot(page);
-
-    // Closing page since test expects it to have closed at the end
-    const context = page.context();
-    await page.close();
-    page = await context.newPage();
-    await waitForPageInit(page);
-    await turnOnMacromoleculesEditor(page);
-  });
+  // Fail while performance issue on Indigo side
+  // test('Check that system does not let uploading corrupted .mol file', async () => {
+  //   /*
+  //   Test case: Import/Saving files
+  //   Description: System does not let uploading corrupted .mol file
+  //   */
+  //   await selectTopPanelButton(TopPanelButton.Open, page);
+  //
+  //   const filename = 'Molfiles-V3000/corrupted-file.mol';
+  //   await openFile(filename, page);
+  //   await selectOptionInDropdown(filename, page);
+  //   await pressButton(page, 'Add to Canvas');
+  //   await takeEditorScreenshot(page);
+  //
+  //   // Closing page since test expects it to have closed at the end
+  //   const context = page.context();
+  //   await page.close();
+  //   page = await context.newPage();
+  //   await waitForPageInit(page);
+  //   await turnOnMacromoleculesEditor(page);
+  // });
 
   test('Validate correct displaying of snake viewed peptide chain loaded from .mol file format', async () => {
     /*
@@ -491,11 +492,13 @@ test.describe('Import modified .mol files from external editor', () => {
       test(`for ${fileName}`, async () => {
         await openFileAndAddToCanvasMacro(`Molfiles-V3000/${fileName}`, page);
         const numberOfPressZoomOut = 4;
+        await page.getByTestId('zoom-selector').click();
         for (let i = 0; i < numberOfPressZoomOut; i++) {
           await waitForRender(page, async () => {
             await page.getByTestId('zoom-out-button').click();
           });
         }
+        await clickInTheMiddleOfTheScreen(page);
       });
     }
   }

diff --git a/...r-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-sequence.spec.ts b/...r-autotests/tests/Macromolecule-editor/Import-Saving-Files/import-saving-sequence.spec.ts
@@ -135,6 +135,7 @@ test.describe('Import-Saving .seq Files', () => {
       page,
     );
     await selectSnakeLayoutModeTool(page);
+    await moveMouseAway(page);
     await takeEditorScreenshot(page);
   });
 

diff --git a/...er-autotests/tests/Macromolecule-editor/Macro-Micro-Switcher/macro-micro-switcher.spec.ts b/...er-autotests/tests/Macromolecule-editor/Macro-Micro-Switcher/macro-micro-switcher.spec.ts
@@ -286,21 +286,27 @@ test.describe('Macro-Micro-Switcher', () => {
     );
     await turnOnMicromoleculesEditor(page);
     await turnOnMacromoleculesEditor(page);
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomIn; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-in-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
 
     await takeEditorScreenshot(page);
 
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomOut; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
+    await page.getByTestId('zoom-selector').click();
     await page.getByTestId('reset-zoom-button').click();
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 
@@ -325,7 +331,9 @@ test.describe('Macro-Micro-Switcher', () => {
     await zoomWithMouseWheel(page, 250);
 
     await takeEditorScreenshot(page);
+    await page.getByTestId('zoom-selector').click();
     await page.getByTestId('reset-zoom-button').click();
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 
@@ -341,11 +349,13 @@ test.describe('Macro-Micro-Switcher', () => {
       'KET/three-monomers-connected-with-bonds.ket',
       page,
     );
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < numberOfPressZoomIn; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-in-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await turnOnMicromoleculesEditor(page);
     await takeEditorScreenshot(page);
 
@@ -773,11 +783,13 @@ test.describe('Macro-Micro-Switcher', () => {
     */
     await openFileAndAddToCanvas('KET/all-type-of-atoms-and-bonds.ket', page);
     await turnOnMacromoleculesEditor(page);
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < 3; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 
@@ -808,11 +820,13 @@ test.describe('Macro-Micro-Switcher', () => {
     await setAtomAndBondSettings(page);
     await takeEditorScreenshot(page);
     await turnOnMacromoleculesEditor(page);
+    await page.getByTestId('zoom-selector').click();
     for (let i = 0; i < 3; i++) {
       await waitForRender(page, async () => {
         await page.getByTestId('zoom-out-button').click();
       });
     }
+    await clickInTheMiddleOfTheScreen(page);
     await takeEditorScreenshot(page);
   });
 

diff --git a/...ding-L-ec903-acro-mode-possible-to-see-Show-Library-button-1-chromium-linux.png b/...ding-L-ec903-acro-mode-possible-to-see-Show-Library-button-1-chromium-linux.png
diff --git a/...ke-full-screen-mode-in-micro-mode-and-switch-to-macro-mode-1-chromium-linux.png b/...ke-full-screen-mode-in-micro-mode-and-switch-to-macro-mode-1-chromium-linux.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,6 +135,7 @@ test.describe('Import-Saving .seq Files', () => { @@
           page,
         );
         await selectSnakeLayoutModeTool(page);
+        await moveMouseAway(page);
         await takeEditorScreenshot(page);
       });
@@ Expand Down @@