Skip to content

Commit eaabcf1

Browse files
accmebootMikhail Vialovrrodionov91AlexeyGirinZhirnoff
authored andcommitted
#5351 - Change the default size of a plus and the arrows (#5549)
* #5351 - Changed the default size of arrows to be 1 bond length * #5153 - Large unbalanced arrow fix * #5362 - Updates remote & standalone structs to send appropriate parameters for certain requests * #5584 - Update indigo to 1.25.0-rc.1 in browser module --------- Co-authored-by: Mikhail Vialov <[email protected]> Co-authored-by: Roman Rodionov <[email protected]> Co-authored-by: Alexey Girin <[email protected]> Co-authored-by: Zhirnoff <[email protected]>
1 parent 4e86192 commit eaabcf1

File tree

752 files changed

+1682
-1447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

752 files changed

+1682
-1447
lines changed

ketcher-autotests/tests/API/api-set-get-molecule.spec.ts

+31-29
Original file line numberDiff line numberDiff line change
@@ -236,38 +236,40 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
236236
await takeEditorScreenshot(page);
237237
});
238238

239-
test('Set and Get Molecule containing chiral centers V3000', async ({
240-
page,
241-
}) => {
242-
/*
243-
Test case: EPMLSOPKET- 10097
244-
Description: Molecule set and get with chiral centers V3000
245-
*/
246-
247-
await waitForSpinnerFinishedWork(
248-
page,
249-
async () =>
250-
await setMolecule(page, 'CC(=O)O[C@@H](C)[C@H](O)Cn1cnc2c1ncnc2N'),
251-
);
252-
const molV3000File = await getMolfile(page, 'v3000');
253-
await saveToFile(
254-
'Molfiles-V3000/test-data-for-chiral-centersv3000-expected.mol',
255-
molV3000File,
256-
);
257-
const METADATA_STRING_INDEX = [1];
239+
test.fail(
240+
'Set and Get Molecule containing chiral centers V3000',
241+
async ({ page }) => {
242+
/*
243+
* IMPORTANT: Test fails because we have bug https://github.com/epam/Indigo/issues/2490
244+
* Test case: EPMLSOPKET- 10097
245+
* Description: Molecule set and get with chiral centers V3000
246+
*/
258247

259-
const { fileExpected: molFileExpected, file: molFile } =
260-
await receiveFileComparisonData({
248+
await waitForSpinnerFinishedWork(
261249
page,
262-
expectedFileName:
263-
'tests/test-data/Molfiles-V3000/test-data-for-chiral-centersv3000-expected.mol',
264-
fileFormat: 'v3000',
265-
metaDataIndexes: METADATA_STRING_INDEX,
266-
});
250+
async () =>
251+
await setMolecule(page, 'CC(=O)O[C@@H](C)[C@H](O)Cn1cnc2c1ncnc2N'),
252+
);
253+
const molV3000File = await getMolfile(page, 'v3000');
254+
await saveToFile(
255+
'Molfiles-V3000/test-data-for-chiral-centersv3000-expected.mol',
256+
molV3000File,
257+
);
258+
const METADATA_STRING_INDEX = [1];
267259

268-
expect(molFile).toEqual(molFileExpected);
269-
await takeEditorScreenshot(page);
270-
});
260+
const { fileExpected: molFileExpected, file: molFile } =
261+
await receiveFileComparisonData({
262+
page,
263+
expectedFileName:
264+
'tests/test-data/Molfiles-V3000/test-data-for-chiral-centersv3000-expected.mol',
265+
fileFormat: 'v3000',
266+
metaDataIndexes: METADATA_STRING_INDEX,
267+
});
268+
269+
expect(molFile).toEqual(molFileExpected);
270+
await takeEditorScreenshot(page);
271+
},
272+
);
271273

272274
test('Check DisableQueryElements parameter', async ({ page }) => {
273275
/*

ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts

+23-21
Original file line numberDiff line numberDiff line change
@@ -309,33 +309,35 @@ test.describe('CDX files without screenshots', () => {
309309
expect(cdxFile).toEqual(cdxFileExpected);
310310
});
311311

312-
test('Validate that the schema with retrosynthetic, angel arrows and plus could be saved to Cdx file and loaded back', async ({
313-
page,
314-
}) => {
315-
/*
312+
test.fail(
313+
'Validate that the schema with retrosynthetic, angel arrows and plus could be saved to Cdx file and loaded back',
314+
async ({ page }) => {
315+
/*
316+
* IMPORTANT: Test fails because we have bug https://github.com/epam/Indigo/issues/2205
316317
Test case: #2097
317318
Description: Validate that schema with retrosynthetic arrow could be saved to Cdx file and loaded back
318319
*/
319320

320-
await openFileAndAddToCanvas(
321-
'KET/schema-with-retrosynthetic-angel-arrows-and-plus.ket',
322-
page,
323-
);
324-
const expectedFile = await getCdx(page);
325-
await saveToFile(
326-
'CDX/schema-with-retrosynthetic-angel-arrows-and-plus.cdx',
327-
expectedFile,
328-
);
329-
330-
const { fileExpected: cdxFileExpected, file: cdxFile } =
331-
await receiveFileComparisonData({
321+
await openFileAndAddToCanvas(
322+
'KET/schema-with-retrosynthetic-angel-arrows-and-plus.ket',
332323
page,
333-
expectedFileName:
334-
'tests/test-data/CDX/schema-with-retrosynthetic-angel-arrows-and-plus.cdx',
335-
});
324+
);
325+
const expectedFile = await getCdx(page);
326+
await saveToFile(
327+
'CDX/schema-with-retrosynthetic-angel-arrows-and-plus.cdx',
328+
expectedFile,
329+
);
336330

337-
expect(cdxFile).toEqual(cdxFileExpected);
338-
});
331+
const { fileExpected: cdxFileExpected, file: cdxFile } =
332+
await receiveFileComparisonData({
333+
page,
334+
expectedFileName:
335+
'tests/test-data/CDX/schema-with-retrosynthetic-angel-arrows-and-plus.cdx',
336+
});
337+
338+
expect(cdxFile).toEqual(cdxFileExpected);
339+
},
340+
);
339341

340342
test('Validate that the schema with two retrosynthetic arrows could be saved to Cdx file and loaded back', async ({
341343
page,

ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts

+27-23
Original file line numberDiff line numberDiff line change
@@ -100,31 +100,34 @@ test.describe('CML files', () => {
100100
expect(cmlFile).toEqual(cmlFileExpected);
101101
});
102102

103-
test('Open and Save file - CML - CML for R-group and other features', async ({
104-
page,
105-
}) => {
106-
/**
107-
* Test case: EPMLSOPKET-1948
108-
* Description: Saved cml file with structure is compering with paste R-group from a mol file
109-
*/
110-
111-
await openFileAddToCanvasTakeScreenshot(
112-
page,
113-
'Molfiles-V2000/cml-1948-R-group.mol',
114-
);
115-
// check that structure opened from file is displayed correctly
116-
117-
const expectedFile = await getCml(page);
118-
await saveToFile('CML/cml-1948-r-group-expected.cml', expectedFile);
119-
const { file: cmlFile, fileExpected: cmlFileExpected } =
120-
await receiveFileComparisonData({
103+
test.fail(
104+
'Open and Save file - CML - CML for R-group and other features',
105+
async ({ page }) => {
106+
/**
107+
* Test case: EPMLSOPKET-1948
108+
* Description: Saved cml file with structure is compering with paste R-group from a mol file
109+
* It needs to be investigated why the test is failing.
110+
* We have bug https://github.com/epam/Indigo/issues/2497
111+
*/
112+
113+
await openFileAddToCanvasTakeScreenshot(
121114
page,
122-
expectedFileName: 'tests/test-data/CML/cml-1948-r-group-expected.cml',
123-
});
124-
// comparing cml file with golden cml file
115+
'Molfiles-V2000/cml-1948-R-group.mol',
116+
);
117+
// check that structure opened from file is displayed correctly
125118

126-
expect(cmlFile).toEqual(cmlFileExpected);
127-
});
119+
const expectedFile = await getCml(page);
120+
await saveToFile('CML/cml-1948-r-group-expected.cml', expectedFile);
121+
const { file: cmlFile, fileExpected: cmlFileExpected } =
122+
await receiveFileComparisonData({
123+
page,
124+
expectedFileName: 'tests/test-data/CML/cml-1948-r-group-expected.cml',
125+
});
126+
// comparing cml file with golden cml file
127+
128+
expect(cmlFile).toEqual(cmlFileExpected);
129+
},
130+
);
128131

129132
test('Validate that unsplit nucleotides connected with peptides could be saved to CML file and loaded back', async ({
130133
page,
@@ -365,6 +368,7 @@ test.describe('CML files', () => {
365368
'Validate that the simple schema with retrosynthetic, angel arrows and plus could be saved to CML file and loaded back',
366369
{ tag: ['@IncorrectResultBecauseOfBug'] },
367370
async ({ page }) => {
371+
test.fail();
368372
/*
369373
Test case: #2071
370374
Description: Validate that the schema with retrosynthetic arrow could be saved to CML file and loaded back

0 commit comments

Comments
 (0)