Skip to content

Commit

Permalink
Backmerge: #5561 Set a new name for the button ACS style (#5728)
Browse files Browse the repository at this point in the history
* fix: update button name

* test:update snapshot

* test: update screenshot

* test: update test

* test: update test

* test:update test

* test:update test

* test: update test mol-files

* test:update test for rnx-files

* test: udate test for sdf-files

* test:update test for acs-style-settings

* test:udate test for cdxml-files

* test:update test for cml-files

* test:update test for ket-files-properties

* test: update test for png-files

* test:update test for svg-files

* fix:fix test description

* test:update test

* test: update test case add delay

* test:update test

* test: fix test

* test: delete delay

* Small fix for autotest

* test:update test

---------

Co-authored-by: Alexey Girin <agirin@mail.ru>
  • Loading branch information
KristinaKasyanovskaya and AlexeyGirin authored Oct 18, 2024
1 parent 1aeadd0 commit 69e477a
Show file tree
Hide file tree
Showing 192 changed files with 20 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-dif-elements.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ test.describe('CML files', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-dif-elements.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ test.describe('Ket files', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-diagonally-arrow.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ test.describe('Open and Save file', () => {
}) => {
/*
Test case: https://github.com/epam/ketcher/issues/5435
Description: Change bond length for ACS styles settings
Description: Change bond length for Set ACS Settings
The Bond length setting is applied and it should be save to mol 2000
*/

Expand Down Expand Up @@ -925,7 +925,7 @@ test.describe('Open and Save file', () => {
}) => {
/*
Test case: https://github.com/epam/ketcher/issues/5435
Description: Change bond length for ACS styles settings
Description: Change bond length for Set ACS Settings
The Bond length setting is applied and it should be save to mol 3000
*/

Expand Down Expand Up @@ -966,12 +966,12 @@ test.describe('Open and Save file', () => {
}) => {
/*
Test case: https://github.com/epam/ketcher/issues/5156
Description: add new option ACS style and check saving to different format
Description: add new option Set ACS Settings and check saving to different format
*/

await openFileAndAddToCanvas('KET/adenosine-triphosphate.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down Expand Up @@ -1005,12 +1005,12 @@ test.describe('Open and Save file', () => {
}) => {
/*
Test case: https://github.com/epam/ketcher/issues/5156
Description: add new option ACS style and check saving to different format
Description: add new option Set ACS Settings and check saving to different format
*/

await openFileAndAddToCanvas('KET/adenosine-triphosphate.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ test.describe('Saving in .png files', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-catalyst.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1372,7 +1372,7 @@ test.describe('Tests for Open and Save RXN file operations', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-long-molecule.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down Expand Up @@ -1409,7 +1409,7 @@ test.describe('Tests for Open and Save RXN file operations', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-long-molecule.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ test('The ACS setting is applied, click on layout and it should be save to sdf 3

await openFileAndAddToCanvas('KET/adenosine-triphosphate.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down Expand Up @@ -812,7 +812,7 @@ test('The ACS setting is applied, click on layout and it should be save to sdf 2

await openFileAndAddToCanvas('KET/adenosine-triphosphate.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ test.describe('Saving in .svg files', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-dif-elements.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ test.describe('ACS Style Settings', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-diagonally-arrow.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await page.waitForTimeout(3000);
await takeEditorScreenshot(page);
await bondsSettings(page);
Expand All @@ -51,7 +51,7 @@ test.describe('ACS Style Settings', () => {
*/
await openFileAndAddToCanvas('KET/layout-with-long-molecule.ket', page);
await openSettings(page);
await pressButton(page, 'ACS Style');
await pressButton(page, 'Set ACS Settings');
await pressButton(page, 'Apply');
await selectTopPanelButton(TopPanelButton.Layout, page);
await takeEditorScreenshot(page);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
setReactionMarginSizeValue,
moveMouseAway,
openSettings,
delay,
} from '@utils';

async function resetSelectToolOff(page: Page) {
Expand Down Expand Up @@ -1409,6 +1410,7 @@ test.describe('Negative cases for General Settings', () => {
const Apply = page.getByRole('button', { name: 'Apply' });
const isDisabled = await Apply.isDisabled();
expect(isDisabled).toBe(true);
await delay(2);
await takeEditorScreenshot(page);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ const SettingsDialog = (props: Props) => {
key="acsstylebutton"
onClick={onACSStyle}
>
ACS Style
Set ACS Settings
</button>
);

Expand Down

0 comments on commit 69e477a

Please sign in to comment.