Skip to content

Commit

Permalink
Revert "Merge branch '6046-autotests-replace-aromatizedearomatize-ope…
Browse files Browse the repository at this point in the history 
…rations-with-valid-helper-functions' into 6210-autotests-test-branch"

This reverts commit 22de8ad, reversing
changes made to c1ef101.
  • Loading branch information
@YatsekTest
YatsekTest committed Dec 25, 2024
1 parent 22de8ad commit f4ec890
Show file tree
Hide file tree
Showing 13 changed files with 113 additions and 180 deletions.
81 changes: 16 additions & 65 deletions ketcher-autotests/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion ketcher-autotests/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"@playwright/test": "^1.44.1",
"eslint": "^8.44.0",
"lint-staged": "^13.1.2",
"playwright": "^1.49.1",
"prettier": "2.8.4"
},
"dependencies": {
Expand Down
6 changes: 2 additions & 4 deletions ketcher-autotests/tests/File-Management/Open-And-Save-Files/Image-files/image-files.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ import {
saveToTemplates,
screenshotBetweenUndoRedo,
selectAllStructuresOnCanvas,
selectAromatizeTool,
selectClearCanvasTool,
selectDearomatizeTool,
selectEraseTool,
selectLeftPanelButton,
selectRectangleSelectionTool,
Expand Down Expand Up @@ -1286,9 +1284,9 @@ test.describe('Image files', () => {
page,
);
await takeEditorScreenshot(page);
await selectAromatizeTool(page);
await selectTopPanelButton(TopPanelButton.Aromatize, page);
await takeEditorScreenshot(page);
await selectDearomatizeTool(page);
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
await takeEditorScreenshot(page);
await verifyFileExport(
page,
Expand Down
97 changes: 71 additions & 26 deletions ketcher-autotests/tests/Indigo-Tools/Aromatize-Dearomatize/aromatize-dearomatize.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/* eslint-disable no-magic-numbers */
import { expect, test } from '@playwright/test';
import {
selectTopPanelButton,
openFileAndAddToCanvas,
TopPanelButton,
takeEditorScreenshot,
copyAndPaste,
cutAndPaste,
Expand All @@ -13,11 +15,10 @@ import {
selectAllStructuresOnCanvas,
receiveFileComparisonData,
saveToFile,
waitForSpinnerFinishedWork,
waitForPageInit,
openFileAndAddToCanvasAsNewProject,
clickOnCanvas,
selectAromatizeTool,
selectDearomatizeTool,
} from '@utils';
import { getCml, getMolfile, getRxn, getSmiles } from '@utils/formats';
import {
Expand All @@ -38,8 +39,8 @@ test.describe('Aromatize/Dearomatize Tool', () => {
Test case: EPMLSOPKET-1867
Description: Nothing is changed.
*/
await selectAromatizeTool(page);
await selectDearomatizeTool(page);
await selectTopPanelButton(TopPanelButton.Aromatize, page);
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
await takeEditorScreenshot(page);
});

Expand All @@ -49,9 +50,13 @@ test.describe('Aromatize/Dearomatize Tool', () => {
Description: Nothing is changed on the canvas because only non-aromatic structures are present on the canvas.
*/
await openFileAndAddToCanvas('Molfiles-V2000/non-aromatic.mol', page);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
await selectDearomatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -66,9 +71,13 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'Molfiles-V2000/non-aromatic-structures.mol',
page,
);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
await selectDearomatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -86,9 +95,13 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'Molfiles-V2000/aromatic-structures.mol',
page,
);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
await selectDearomatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -104,9 +117,13 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'Molfiles-V2000/cycles-with-aromatic-bonds.mol',
page,
);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
await selectDearomatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -122,8 +139,12 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'Molfiles-V2000/cycles-with-aromatic-bonds.mol',
page,
);
await selectAromatizeTool(page);
await selectDearomatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
});
await pressUndoButton(page);
await takeEditorScreenshot(page);
await pressRedoButton(page);
Expand All @@ -145,7 +166,9 @@ test.describe('Aromatize/Dearomatize Tool', () => {
);
await copyAndPaste(page);
await clickOnCanvas(page, CANVAS_CLICK_X, CANVAS_CLICK_Y);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -163,7 +186,9 @@ test.describe('Aromatize/Dearomatize Tool', () => {
);
await cutAndPaste(page);
await clickOnCanvas(page, CANVAS_CLICK_X, CANVAS_CLICK_Y);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -177,7 +202,9 @@ test.describe('Aromatize/Dearomatize Tool', () => {
*/
await selectRing(RingButton.Benzene, page);
await clickInTheMiddleOfTheScreen(page);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await selectAllStructuresOnCanvas(page);
await selectAtomInToolbar(AtomButton.Nitrogen, page);
await takeEditorScreenshot(page);
Expand Down Expand Up @@ -393,7 +420,9 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'KET/all-possible-query-features-with-out-custom-query.ket',
page,
);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
},
);
Expand Down Expand Up @@ -422,8 +451,12 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'KET/all-possible-query-features-with-out-custom-query.ket',
page,
);
await selectAromatizeTool(page);
await selectDearomatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
});
await takeEditorScreenshot(page);
},
);
Expand All @@ -447,7 +480,9 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'KET/all-possible-custom-query-features.ket',
page,
);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -471,8 +506,12 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'KET/all-possible-custom-query-features.ket',
page,
);
await selectAromatizeTool(page);
await selectDearomatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -487,7 +526,9 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'KET/schema-with-retrosynthetic-arrow-for-options.ket',
page,
);
await selectAromatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await takeEditorScreenshot(page);
});

Expand All @@ -502,8 +543,12 @@ test.describe('Aromatize/Dearomatize Tool', () => {
'KET/schema-with-retrosynthetic-arrow-for-options.ket',
page,
);
await selectAromatizeTool(page);
await selectDearomatizeTool(page);
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Aromatize, page);
});
await waitForSpinnerFinishedWork(page, async () => {
await selectTopPanelButton(TopPanelButton.Dearomatize, page);
});
await takeEditorScreenshot(page);
});
});
Loading

0 comments on commit f4ec890

Please sign in to comment.