Skip to content

Commit

Permalink
6341 autotests remove all movemouseaway operatations made for suppres…
Browse files Browse the repository at this point in the history
…siong tooltip apperance by adding hidemonomerpreview flag to takeeditorscreenshot function call (#6613)

* Replaced method moveMouseAway with hideMonomerPreview where necessary.

* fix import

* fix mistakes

---------

Co-authored-by: Konstantin <[email protected]>
  • Loading branch information
NewerNaigil and Konstantin authored Mar 9, 2025
1 parent ed9cb5b commit 3094b12
Show file tree
Hide file tree
Showing 22 changed files with 119 additions and 178 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ test.describe('setMode', () => {
await openFileAndAddToCanvasMacro('KET/snake-mode-peptides.ket', page);
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await setMode(page, 'flex');
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('Validate ketcher.setMode for Snake Mode', async ({ page }) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ test.describe('Flex mode copy&paste', () => {
await page.mouse.move(startX, startY);
await pasteFromClipboardByKeyboard(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await clickUndo(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@ test.describe('Sequence-edit mode', () => {
await page.keyboard.press('Enter');
await pasteFromClipboardByKeyboard(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

// Fail while performance issue on Indigo side
Expand Down Expand Up @@ -270,10 +270,10 @@ test.describe('Sequence-edit mode', () => {
await copyToClipboardByKeyboard(page);
await pasteFromClipboardByKeyboard(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('Pasting several separate monomers are prohibited in text-editing mode', async ({
Expand All @@ -297,8 +297,7 @@ test.describe('Sequence-edit mode', () => {
await page.getByTestId('edit_sequence').click();
await page.keyboard.press('ArrowLeft');
await pasteFromClipboardByKeyboard(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('After pasting between two nucleotides in text-editing mode,bond R2-R1 between them is broken,and pasted fragment is merged with existing chain', async ({
Expand Down Expand Up @@ -326,6 +325,6 @@ test.describe('Sequence-edit mode', () => {
});
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ test.describe('Erase Tool', () => {
await selectMonomer(page, Chem.Test_6_Ch);
await clickInTheMiddleOfTheScreen(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await selectEraseTool(page);
await getMonomerLocator(page, Chem.Test_6_Ch).click();
await takeEditorScreenshot(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +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);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('Check that you can save snake viewed chain of peptides in a .fasta file', async ({
Expand Down Expand Up @@ -422,8 +421,7 @@ test.describe('Import-Saving .fasta Files', () => {
);

await zoomWithMouseWheel(page, -600);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'FASTA');
Expand Down Expand Up @@ -489,7 +487,7 @@ test.describe('Import-Saving .fasta Files', () => {

await zoomWithMouseWheel(page, -200);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'FASTA');
Expand Down Expand Up @@ -562,7 +560,7 @@ test.describe('Import-Saving .fasta Files', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'FASTA');
Expand Down Expand Up @@ -627,7 +625,7 @@ test.describe('Import-Saving .fasta Files', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'FASTA');
Expand Down Expand Up @@ -691,8 +689,7 @@ test.describe('Import-Saving .fasta Files', () => {
);

await zoomWithMouseWheel(page, -200);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'FASTA');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ test.afterAll(async ({ browser }) => {
test.describe('Import-Saving .idt Files', () => {
test(`Import .idt file`, async () => {
await openFileAndAddToCanvasMacro('IDT/idt-a.idt', page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('Check option "IDT" to the format dropdown menu of modal window Paste from the clipboard is exist', async () => {
Expand Down Expand Up @@ -744,7 +743,7 @@ test.describe('Import-Saving .idt Files', () => {
await takeEditorScreenshot(page);
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await selectSequenceLayoutModeTool(page);
await takeEditorScreenshot(page);
});
Expand Down Expand Up @@ -1597,8 +1596,7 @@ test.describe('Ambiguous monomers: ', () => {
);

await zoomWithMouseWheel(page, -600);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
Expand Down Expand Up @@ -1626,8 +1624,7 @@ test.describe('Ambiguous monomers: ', () => {
);

await zoomWithMouseWheel(page, -600);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
Expand Down Expand Up @@ -1655,7 +1652,7 @@ test.describe('Ambiguous monomers: ', () => {

await zoomWithMouseWheel(page, -200);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
Expand Down Expand Up @@ -1684,7 +1681,7 @@ test.describe('Ambiguous monomers: ', () => {

await zoomWithMouseWheel(page, -200);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
Expand Down Expand Up @@ -1712,7 +1709,7 @@ test.describe('Ambiguous monomers: ', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
Expand All @@ -1739,7 +1736,7 @@ test.describe('Ambiguous monomers: ', () => {
);
await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await verifyFileExport(
page,
'IDT/Ambiguous DNA Bases (mixed)-expected.idt',
Expand Down Expand Up @@ -1771,7 +1768,7 @@ test.describe('Ambiguous monomers: ', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
Expand All @@ -1798,7 +1795,7 @@ test.describe('Ambiguous monomers: ', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await verifyFileExport(
page,
'IDT/Ambiguous RNA Bases (mixed)-expected.idt',
Expand Down Expand Up @@ -1828,8 +1825,7 @@ test.describe('Ambiguous monomers: ', () => {
page,
);
await zoomWithMouseWheel(page, -200);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
await takeEditorScreenshot(page);
Expand All @@ -1852,8 +1848,7 @@ test.describe('Ambiguous monomers: ', () => {
page,
);
await zoomWithMouseWheel(page, -200);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await verifyFileExport(
page,
'IDT/Ambiguous (common) Bases (mixed)-expected.idt',
Expand Down Expand Up @@ -1886,7 +1881,7 @@ test.describe('Ambiguous monomers: ', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
Expand Down Expand Up @@ -1917,7 +1912,7 @@ test.describe('Ambiguous monomers: ', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'IDT');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ test.describe('Import-Saving .ket Files', () => {
await getMonomerLocator(page, { monomerAlias: 'Ph' }).first().hover();
await dragMouseTo(400, 400, page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('Check that fields "class" and "classHELM" are presents into .ket file', async () => {
Expand Down Expand Up @@ -246,7 +246,7 @@ test.describe('Import-Saving .ket Files', () => {
await openFileAndAddToCanvasMacro('KET/snake-mode-peptides.ket', page);
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('Check that .ket file with macro structures is imported correctly in macro mode when saving it in micro mode', async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ test.describe('Import-Saving .mol Files', () => {
);
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

// Closing page since test expects it to have closed at the end
const context = page.context();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,7 @@ test.describe('Import-Saving .seq Files', () => {
page,
);
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('Check that you can save snake viewed chain of peptides in a .seq file', async ({
Expand Down Expand Up @@ -284,8 +283,7 @@ test.describe('Import-Saving .seq Files', () => {
);

await zoomWithMouseWheel(page, -600);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'Sequence (1-letter code)');
Expand Down Expand Up @@ -351,7 +349,7 @@ test.describe('Import-Saving .seq Files', () => {

await zoomWithMouseWheel(page, -200);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'Sequence (1-letter code)');
Expand Down Expand Up @@ -424,7 +422,7 @@ test.describe('Import-Saving .seq Files', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'Sequence (1-letter code)');
Expand Down Expand Up @@ -489,7 +487,7 @@ test.describe('Import-Saving .seq Files', () => {

await zoomWithMouseWheel(page, -100);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'Sequence (1-letter code)');
Expand Down Expand Up @@ -553,8 +551,7 @@ test.describe('Import-Saving .seq Files', () => {
);

await zoomWithMouseWheel(page, -200);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });

await selectTopPanelButton(TopPanelButton.Save, page);
await chooseFileFormat(page, 'Sequence (1-letter code)');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ test(`Verify the behavior when bonds are dragged and moved in macromolecules mod
await bondLocator.first().hover({ force: true });
await dragMouseTo(400, 400, page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -845,8 +845,7 @@ test.describe('RNA Library', () => {
await drawThreeMonomersConnectedWithBonds(page);
await selectEraseTool(page);
await bondLine.click();
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
});

test('Draw Sugar-Base-Phosphate and try to attach bond to occupied attachment point', async () => {
Expand Down Expand Up @@ -1067,7 +1066,7 @@ test.describe('RNA Library', () => {
await takeEditorScreenshot(page);
await selectSnakeLayoutModeTool(page);
await moveMouseAway(page);
await takeEditorScreenshot(page);
await takeEditorScreenshot(page, { hideMonomerPreview: true });
await selectSequenceLayoutModeTool(page);
await takeEditorScreenshot(page);
await turnOnMicromoleculesEditor(page);
Expand Down
Loading

0 comments on commit 3094b12

Please sign in to comment.