{
it('renders correctly', () => {
- const view = render(withThemeProvider(
));
+ jest.spyOn(CoreEditor, 'provideEditorInstance').mockImplementation(() => {
+ return {
+ drawingEntitiesManager: {
+ micromoleculesHiddenEntities: {
+ clone: () => {
+ return new Struct();
+ },
+ mergeInto: jest.fn(),
+ },
+ setMicromoleculesHiddenEntities: jest.fn(),
+ monomers: [],
+ polymerBonds: [],
+ },
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ } as any;
+ });
+ const view = render(withThemeAndStoreProvider(
));
const filenameInput = screen.getByRole('textbox', {
name: 'File name:',
});
- const fileFormatInput = screen.getByRole('button', {
- name: 'MDL Molfile V3000',
- });
+ const fileFormatInput = screen.getByText('Ket');
expect(view).toMatchSnapshot();
expect(filenameInput).toBeVisible();
@@ -43,7 +58,7 @@ describe('Save modal', () => {
});
it.skip('renders dropdown options correctly', () => {
- render(withThemeProvider(
));
+ render(withThemeAndStoreProvider(
));
const fileFormat = screen.getByRole('button', {
name: 'MDL Molfile V3000',
diff --git a/packages/ketcher-polymer-editor-react/src/components/modal/save/__snapshots__/Save.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/components/modal/save/__snapshots__/Save.test.tsx.snap
index e13aa883ca..ba954a05eb 100644
--- a/packages/ketcher-polymer-editor-react/src/components/modal/save/__snapshots__/Save.test.tsx.snap
+++ b/packages/ketcher-polymer-editor-react/src/components/modal/save/__snapshots__/Save.test.tsx.snap
@@ -10,13 +10,13 @@ Object {
aria-hidden="true"
/>
-
-
- Errors
+ Cancel
- Save as file
+ Save
-
-
-
- Presets
- (
- 0
- )
-
-
-
+
+
+
+ Presets
+ (
+ 0
+ )
+
+
+
+
-
-
-
- New Preset
-
+
+ New Preset
+
+ class="css-1jn33hb"
+ >
+
+
@@ -128,7 +132,7 @@ exports[`Test Rna Accordion component should render 1`] = `
)
{
rnaBuilder: {
activePreset: {
name: 'MyRna',
- sugar: {},
- phosphate: {},
- base: {},
+ sugar: {
+ props: {
+ MonomerName: '',
+ },
+ },
+ phosphate: {
+ props: {
+ MonomerName: '',
+ },
+ },
+ base: {
+ props: {
+ MonomerName: '',
+ },
+ },
},
},
},
@@ -60,9 +72,21 @@ describe('Test Rna Editor Expanded component', () => {
rnaBuilder: {
activePreset: {
name: 'MyRna',
- sugar: {},
- phosphate: {},
- base: {},
+ sugar: {
+ props: {
+ MonomerName: '',
+ },
+ },
+ phosphate: {
+ props: {
+ MonomerName: '',
+ },
+ },
+ base: {
+ props: {
+ MonomerName: '',
+ },
+ },
presetInList: {},
},
},
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/__snapshots__/RnaEditorExpanded.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/__snapshots__/RnaEditorExpanded.test.tsx.snap
index fd0c5d6031..7326a6bb2d 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/__snapshots__/RnaEditorExpanded.test.tsx.snap
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/RnaBuilder/RnaEditor/RnaEditorExpanded/__snapshots__/RnaEditorExpanded.test.tsx.snap
@@ -22,22 +22,24 @@ exports[`Test Rna Editor Expanded component should render correctly in edit mode
>
{
),
);
- const div = screen.getByTestId(preset.name as string);
+ const div = screen.getByTestId('MyRna_._._.');
fireEvent.click(div);
expect(rnaPresetItemHandleClick.mock.calls.length).toEqual(1);
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/__snapshots__/MonomerGroup.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/__snapshots__/MonomerGroup.test.tsx.snap
index 2440d9013c..ff0ab3bd34 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/__snapshots__/MonomerGroup.test.tsx.snap
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryGroup/__snapshots__/MonomerGroup.test.tsx.snap
@@ -2,10 +2,9 @@
exports[`Monomer Group should apply correct style if selected 1`] = `
R
@@ -37,10 +36,9 @@ Object {
class="css-14bnc38"
>
R
@@ -52,10 +50,9 @@ Object {
m
@@ -67,10 +64,9 @@ Object {
d
@@ -82,10 +78,9 @@ Object {
ar
@@ -97,10 +92,9 @@ Object {
Ld
@@ -130,10 +124,9 @@ Object {
class="css-14bnc38"
>
R
@@ -145,10 +138,9 @@ Object {
m
@@ -160,10 +152,9 @@ Object {
d
@@ -175,10 +166,9 @@ Object {
ar
@@ -190,10 +180,9 @@ Object {
Ld
@@ -273,10 +262,9 @@ Object {
class="css-14bnc38"
>
R
@@ -288,10 +276,9 @@ Object {
m
@@ -303,10 +290,9 @@ Object {
d
@@ -318,10 +304,9 @@ Object {
ar
@@ -333,10 +318,9 @@ Object {
Ld
@@ -359,10 +343,9 @@ Object {
class="css-14bnc38"
>
R
@@ -374,10 +357,9 @@ Object {
m
@@ -389,10 +371,9 @@ Object {
d
@@ -404,10 +385,9 @@ Object {
ar
@@ -419,10 +399,9 @@ Object {
Ld
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/MonomerItem.test.tsx b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/MonomerItem.test.tsx
index 180a10c453..94989d7621 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/MonomerItem.test.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryItem/MonomerItem.test.tsx
@@ -24,7 +24,7 @@ describe('Test Monomer Item component', () => {
),
);
- const div = screen.getByTestId(monomer.props.MonomerNaturalAnalogCode);
+ const div = screen.getByText(monomer.label);
fireEvent.click(div);
expect(monomerItemHandleClick.mock.calls.length).toEqual(1);
diff --git a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/__snapshots__/MonomerList.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/__snapshots__/MonomerList.test.tsx.snap
index a8796dd438..c101eeec1d 100644
--- a/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/__snapshots__/MonomerList.test.tsx.snap
+++ b/packages/ketcher-polymer-editor-react/src/components/monomerLibrary/monomerLibraryList/__snapshots__/MonomerList.test.tsx.snap
@@ -12,18 +12,12 @@ Object {
class="css-1jn33hb"
>
-
- F
-
-
-
Phe4SD
@@ -47,18 +41,12 @@ Object {
class="css-1jn33hb"
>
-
- F
-
-
-
Phe4SD
@@ -139,11 +127,12 @@ Object {
class="css-1jn33hb"
>
PEG2
@@ -167,11 +156,12 @@ Object {
class="css-1jn33hb"
>
PEG2
diff --git a/packages/ketcher-polymer-editor-react/src/components/rna/Switcher/Switcher.test.tsx b/packages/ketcher-polymer-editor-react/src/components/rna/Switcher/Switcher.test.tsx
index b13e732c87..936f3149f0 100644
--- a/packages/ketcher-polymer-editor-react/src/components/rna/Switcher/Switcher.test.tsx
+++ b/packages/ketcher-polymer-editor-react/src/components/rna/Switcher/Switcher.test.tsx
@@ -68,6 +68,6 @@ describe('RNA Switcher component', () => {
const resetBtn = screen.getByText('Reset');
fireEvent.click(resetBtn);
const nucleotideBtn = screen.getByText(buttons[0]);
- expect(nucleotideBtn).toHaveStyle(`background-color: rgb(22, 119, 130)`);
+ expect(nucleotideBtn).toHaveStyle(`background-color: rgb(0, 131, 143)`);
});
});
diff --git a/packages/ketcher-polymer-editor-react/src/components/shared/modal/__snapshots__/Modal.test.tsx.snap b/packages/ketcher-polymer-editor-react/src/components/shared/modal/__snapshots__/Modal.test.tsx.snap
index dad0b102d5..9a156a6d67 100644
--- a/packages/ketcher-polymer-editor-react/src/components/shared/modal/__snapshots__/Modal.test.tsx.snap
+++ b/packages/ketcher-polymer-editor-react/src/components/shared/modal/__snapshots__/Modal.test.tsx.snap
@@ -10,13 +10,13 @@ Object {
aria-hidden="true"
/>
title
@@ -50,6 +50,7 @@ Object {
type="button"
>
-
Content
diff --git a/packages/ketcher-polymer-editor-react/src/helpers/getDefaultPresets.test.tsx b/packages/ketcher-polymer-editor-react/src/helpers/getDefaultPresets.test.tsx
index 57a25d32da..9f730073fb 100644
--- a/packages/ketcher-polymer-editor-react/src/helpers/getDefaultPresets.test.tsx
+++ b/packages/ketcher-polymer-editor-react/src/helpers/getDefaultPresets.test.tsx
@@ -32,7 +32,7 @@ import { MonomerItemType } from 'ketcher-core';
describe('getDefaultPreset function', () => {
it('should return empty array if cannot return default nucteotides', () => {
const testArr = getDefaultPresets(monomers);
- expect(testArr).toBeEmptyArray();
+ expect(testArr.length).toEqual(0);
});
it('should return array of default presets from monomers', () => {
@@ -52,6 +52,7 @@ describe('getDefaultPreset function', () => {
base: thymine,
sugar: ribose,
phosphate,
+ default: true,
};
const guanineNucleotide: IRnaPreset = {
@@ -59,22 +60,15 @@ describe('getDefaultPreset function', () => {
base: guanine,
sugar: ribose,
phosphate,
+ default: true,
};
const testArr = getDefaultPresets(monomerData);
expect(testArr).toContainEqual(thymineNucleotide);
expect(testArr).toContainEqual(guanineNucleotide);
- expect(testArr).toContainEqual(
- expect.not.objectContaining({
- MonomerName: '3FAM',
- Name: '3-FAM',
- }),
- );
- expect(testArr).toContainEqual(
- expect.objectContaining({
- MonomerName: 'G',
- Name: 'Guanine',
- }),
- );
+ expect(testArr).not.toContainEqual({
+ MonomerName: '3FAM',
+ Name: '3-FAM',
+ });
});
});
diff --git a/packages/ketcher-polymer-editor-react/src/testMockData/monomerPresets.ts b/packages/ketcher-polymer-editor-react/src/testMockData/monomerPresets.ts
index e480f7b6c8..210f6ef0b8 100644
--- a/packages/ketcher-polymer-editor-react/src/testMockData/monomerPresets.ts
+++ b/packages/ketcher-polymer-editor-react/src/testMockData/monomerPresets.ts
@@ -66,7 +66,7 @@ const phosphate = {
MonomerCaps: {},
MonomerCode: '',
},
- label: '',
+ label: 'P',
struct: new Struct(),
};
const ribose = {
@@ -79,7 +79,7 @@ const ribose = {
MonomerCaps: {},
MonomerCode: '',
},
- label: '',
+ label: 'R',
struct: new Struct(),
};
const thymine = {
@@ -92,7 +92,7 @@ const thymine = {
MonomerCaps: {},
MonomerCode: '',
},
- label: '',
+ label: 'T',
struct: new Struct(),
};
const cytosine = {
@@ -144,7 +144,7 @@ const guanine = {
MonomerCaps: {},
MonomerCode: '',
},
- label: '',
+ label: 'G',
struct: new Struct(),
};