diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts-snapshots/R-Group-Label-Tool-Add-Template-to-the-R-Group-Label-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts-snapshots/R-Group-Label-Tool-Add-Template-to-the-R-Group-Label-1-chromium-linux.png index 69dbf002d2..a9e723be69 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts-snapshots/R-Group-Label-Tool-Add-Template-to-the-R-Group-Label-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/R-group-tool/r-group-label-dialog.spec.ts-snapshots/R-Group-Label-Tool-Add-Template-to-the-R-Group-Label-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/bond-properties.spec.ts-snapshots/Bond-Properties-Different-combinations---2-3-open-the-saved-mol-file-1-chromium-linux.png b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/bond-properties.spec.ts-snapshots/Bond-Properties-Different-combinations---2-3-open-the-saved-mol-file-1-chromium-linux.png index 58aa6b4ac3..815461b293 100644 Binary files a/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/bond-properties.spec.ts-snapshots/Bond-Properties-Different-combinations---2-3-open-the-saved-mol-file-1-chromium-linux.png and b/ketcher-autotests/tests/Structure-Creating-&-Editing/Actions-With-Structures/Selection-Tool/bond-properties.spec.ts-snapshots/Bond-Properties-Different-combinations---2-3-open-the-saved-mol-file-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Functional-Groups/lookup-abbreviations.spec.ts-snapshots/Lookup-Abbreviations-tests-Lookup-Abbreviation-selecting-template-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Functional-Groups/lookup-abbreviations.spec.ts-snapshots/Lookup-Abbreviations-tests-Lookup-Abbreviation-selecting-template-1-chromium-linux.png index 26461e88c9..2add0368e6 100644 Binary files a/ketcher-autotests/tests/Templates/Functional-Groups/lookup-abbreviations.spec.ts-snapshots/Lookup-Abbreviations-tests-Lookup-Abbreviation-selecting-template-1-chromium-linux.png and b/ketcher-autotests/tests/Templates/Functional-Groups/lookup-abbreviations.spec.ts-snapshots/Lookup-Abbreviations-tests-Lookup-Abbreviation-selecting-template-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts b/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts index 282e3aff61..c679005d63 100644 --- a/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts +++ b/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts @@ -8,11 +8,16 @@ import { clickInTheMiddleOfTheScreen, takeEditorScreenshot, STRUCTURE_LIBRARY_BUTTON_NAME, + waitForPageInit, } from '@utils'; -test.describe('Open Ketcher', () => { +test.describe('Salts and Solvents replacement', () => { test.beforeEach(async ({ page }) => { - await page.goto(''); + await waitForPageInit(page); + }); + + test.afterEach(async ({ page }) => { + await takeEditorScreenshot(page); }); test('Verify if the new Salt or Solvent is replacing old one', async ({ @@ -31,7 +36,6 @@ Test case: EPMLSOPKET-12972 - 'Check that new Salt or Solvent is replacing the p await page.getByRole('tab', { name: 'Salts and Solvents' }).click(); await selectSaltsAndSolvents(SaltsAndSolvents.AceticAcid, page); await clickInTheMiddleOfTheScreen(page); - await takeEditorScreenshot(page); }); test('Verify if Methan Sulphonic Acid replace the Nitrogen atom', async ({ diff --git a/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-Methan-Sulphonic-Acid-replace-the-Nitrogen-atom-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-Methan-Sulphonic-Acid-replace-the-Nitrogen-atom-1-chromium-linux.png new file mode 100644 index 0000000000..67be94df2f Binary files /dev/null and b/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-Methan-Sulphonic-Acid-replace-the-Nitrogen-atom-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-the-new-Salt-or-Solvent-is-replacing-old-one-1-chromium-linux.png b/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-the-new-Salt-or-Solvent-is-replacing-old-one-1-chromium-linux.png new file mode 100644 index 0000000000..7b40c766df Binary files /dev/null and b/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-the-new-Salt-or-Solvent-is-replacing-old-one-1-chromium-linux.png differ diff --git a/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-the-new-Salt-or-Solvent-is-replacing-old-one-2-chromium-linux.png b/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-the-new-Salt-or-Solvent-is-replacing-old-one-2-chromium-linux.png new file mode 100644 index 0000000000..505b0e0928 Binary files /dev/null and b/ketcher-autotests/tests/Templates/Salts-and-Solvents/check-new-salt-or-solvent-is-replacing.spec.ts-snapshots/Salts-and-Solvents-replacement-Verify-if-the-new-Salt-or-Solvent-is-replacing-old-one-2-chromium-linux.png differ diff --git a/ketcher-autotests/tests/test-data/Rxn-V2000/rxn-1465-to-open-expected.rxn b/ketcher-autotests/tests/test-data/Rxn-V2000/rxn-1465-to-open-expected.rxn index da6768b4a7..5fc0e1ffc3 100644 --- a/ketcher-autotests/tests/test-data/Rxn-V2000/rxn-1465-to-open-expected.rxn +++ b/ketcher-autotests/tests/test-data/Rxn-V2000/rxn-1465-to-open-expected.rxn @@ -1,11 +1,11 @@ $RXN - -INDIGO- 0918230300 + -INDIGO- 0925231455 1 1 $MOL - -INDIGO-09182303002D + -INDIGO-09252314552D 11 10 0 0 0 0 0 0 0 0999 V2000 10.7449 -8.0500 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 @@ -32,7 +32,7 @@ $MOL M END $MOL - -INDIGO-09182303002D + -INDIGO-09252314552D 6 6 0 0 0 0 0 0 0 0999 V2000 17.9598 -11.5501 0.0000 C 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/packages/ketcher-react/src/script/ui/component/form/Select/Select.tsx b/packages/ketcher-react/src/script/ui/component/form/Select/Select.tsx index 4bf1cdfdd0..1432745001 100644 --- a/packages/ketcher-react/src/script/ui/component/form/Select/Select.tsx +++ b/packages/ketcher-react/src/script/ui/component/form/Select/Select.tsx @@ -93,6 +93,7 @@ const Select = ({ className={clsx({ [`dropdown-${formName}_${name}`]: formName, })} + data-testid={`${option.label}-option`} > {option.label} diff --git a/packages/ketcher-react/src/script/ui/component/form/form/form.jsx b/packages/ketcher-react/src/script/ui/component/form/form/form.jsx index de8e412fd6..3d3f6bb188 100644 --- a/packages/ketcher-react/src/script/ui/component/form/form/form.jsx +++ b/packages/ketcher-react/src/script/ui/component/form/form/form.jsx @@ -137,8 +137,15 @@ function Field(props) { const desc = rest.schema || schema.properties[name]; const { dataError, ...fieldOpts } = stateStore.field(name, onChange); const Component = component; + console.log(Component, rest); const formField = component ? ( - + ) : (