epam · rrodionov91 · Dec 3, 2024 · Nov 25, 2024 · Nov 25, 2024 · Nov 26, 2024
diff --git a/ketcher-autotests/tests/API/view-only-mode.spec.ts b/ketcher-autotests/tests/API/view-only-mode.spec.ts
@@ -29,7 +29,7 @@ import {
 import { closeErrorAndInfoModals } from '@utils/common/helpers';
 import {
   FileType,
-  verifyFile,
+  verifyFile2,
   verifyMolfile,
 } from '@utils/files/receiveFileComparisonData';
 import {
@@ -485,10 +485,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
     await selectRingButton(RingButton.Benzene, page);
     await clickInTheMiddleOfTheScreen(page);
     await enableViewOnlyModeBySetOptions(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'KET/benzene-ring-saved-in-view-only-mode-expected.ket',
-      'tests/test-data/KET/benzene-ring-saved-in-view-only-mode-expected.ket',
       FileType.KET,
     );
     await openFileAndAddToCanvasAsNewProject(

diff --git a/...Examples/ketcher-files.spec.ts-snapshots/opening-rnx-files-1-chromium-linux.png b/...Examples/ketcher-files.spec.ts-snapshots/opening-rnx-files-1-chromium-linux.png
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDX-Files/cdx-files.spec.ts
@@ -12,7 +12,7 @@ import {
   openPasteFromClipboard,
   pressButton,
 } from '@utils';
-import { FileType, verifyFile } from '@utils/files/receiveFileComparisonData';
+import { FileType, verifyFile2 } from '@utils/files/receiveFileComparisonData';
 import { getCdx } from '@utils/formats';
 
 test.describe('CDX files', () => {
@@ -475,10 +475,9 @@ test.describe('CDX files without screenshots', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDX/reactant-single-reaction-expected.cdx',
-      'tests/test-data/CDX/reactant-single-reaction-expected.cdx',
       FileType.CDX,
     );
     const fileContent = await readFileContents(
@@ -501,10 +500,9 @@ test.describe('CDX files without screenshots', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDX/products-single-reaction-expected.cdx',
-      'tests/test-data/CDX/products-single-reaction-expected.cdx',
       FileType.CDX,
     );
     const fileContent = await readFileContents(
@@ -527,10 +525,9 @@ test.describe('CDX files without screenshots', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDX/ket-cascade-reaction-3-1-2-1-1-expected.cdx',
-      'tests/test-data/CDX/ket-cascade-reaction-3-1-2-1-1-expected.cdx',
       FileType.CDX,
     );
     const fileContent = await readFileContents(
@@ -553,10 +550,9 @@ test.describe('CDX files without screenshots', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDX/multiple-individual-reactions-expected.cdx',
-      'tests/test-data/CDX/multiple-individual-reactions-expected.cdx',
       FileType.CDX,
     );
     const fileContent = await readFileContents(
@@ -579,10 +575,9 @@ test.describe('CDX files without screenshots', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDX/several-cascade-reactions-expected.cdx',
-      'tests/test-data/CDX/several-cascade-reactions-expected.cdx',
       FileType.CDX,
     );
     const fileContent = await readFileContents(
@@ -605,10 +600,9 @@ test.describe('CDX files without screenshots', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDX/combination-of-single-and-cascade-reactions-expected.cdx',
-      'tests/test-data/CDX/combination-of-single-and-cascade-reactions-expected.cdx',
       FileType.CDX,
     );
     const fileContent = await readFileContents(
@@ -631,10 +625,9 @@ test.describe('CDX files without screenshots', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDX/cascade-of-multiple-reactions-expected.cdx',
-      'tests/test-data/CDX/cascade-of-multiple-reactions-expected.cdx',
       FileType.CDX,
     );
     const fileContent = await readFileContents(
@@ -657,10 +650,9 @@ test.describe('CDX files without screenshots', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDX/pathway-with-mixed-single-reactions-and-cascades-expected.cdx',
-      'tests/test-data/CDX/pathway-with-mixed-single-reactions-and-cascades-expected.cdx',
       FileType.CDX,
     );
     const fileContent = await readFileContents(

diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDXML-Files/cdxml-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/CDXML-Files/cdxml-files.spec.ts
@@ -22,7 +22,7 @@ import {
   setReactionMarginSizeValue,
   selectAllStructuresOnCanvas,
 } from '@utils';
-import { FileType, verifyFile } from '@utils/files/receiveFileComparisonData';
+import { FileType, verifyFile2 } from '@utils/files/receiveFileComparisonData';
 import { getCdxml } from '@utils/formats';
 
 test.describe('Tests for API setMolecule/getMolecule', () => {
@@ -675,10 +675,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDXML/reactant-single-reaction-expected.cdxml',
-      'tests/test-data/CDXML/reactant-single-reaction-expected.cdxml',
       FileType.CDXML,
     );
     await openFileAndAddToCanvasAsNewProject(
@@ -700,10 +699,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDXML/products-single-reaction-expected.cdxml',
-      'tests/test-data/CDXML/products-single-reaction-expected.cdxml',
       FileType.CDXML,
     );
     await openFileAndAddToCanvasAsNewProject(
@@ -725,10 +723,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDXML/ket-cascade-reaction-3-1-2-1-1-expected.cdxml',
-      'tests/test-data/CDXML/ket-cascade-reaction-3-1-2-1-1-expected.cdxml',
       FileType.CDXML,
     );
     await openFileAndAddToCanvasAsNewProject(
@@ -750,10 +747,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDXML/multiple-individual-reactions-expected.cdxml',
-      'tests/test-data/CDXML/multiple-individual-reactions-expected.cdxml',
       FileType.CDXML,
     );
     await openFileAndAddToCanvasAsNewProject(
@@ -775,10 +771,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDXML/several-cascade-reactions-expected.cdxml',
-      'tests/test-data/CDXML/several-cascade-reactions-expected.cdxml',
       FileType.CDXML,
     );
     await openFileAndAddToCanvasAsNewProject(
@@ -800,10 +795,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDXML/combination-of-single-and-cascade-reactions-expected.cdxml',
-      'tests/test-data/CDXML/combination-of-single-and-cascade-reactions-expected.cdxml',
       FileType.CDXML,
     );
     await openFileAndAddToCanvasAsNewProject(
@@ -825,10 +819,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDXML/cascade-of-multiple-reactions-expected.cdxml',
-      'tests/test-data/CDXML/cascade-of-multiple-reactions-expected.cdxml',
       FileType.CDXML,
     );
     await openFileAndAddToCanvasAsNewProject(
@@ -850,10 +843,9 @@ test.describe('Tests for API setMolecule/getMolecule', () => {
       page,
     );
     await takeEditorScreenshot(page);
-    await verifyFile(
+    await verifyFile2(
       page,
       'CDXML/pathway-with-mixed-single-reactions-and-cascades-expected.cdxml',
-      'tests/test-data/CDXML/pathway-with-mixed-single-reactions-and-cascades-expected.cdxml',
       FileType.CDXML,
     );
     await openFileAndAddToCanvasAsNewProject(

diff --git a/...e-ACS--8d70e--and-it-should-be-save-to-CDXML-specification-1-chromium-linux.png b/...e-ACS--8d70e--and-it-should-be-save-to-CDXML-specification-1-chromium-linux.png
diff --git a/...e-ACS--e8e44--and-it-should-be-save-to-CDXML-specification-2-chromium-linux.png b/...e-ACS--e8e44--and-it-should-be-save-to-CDXML-specification-2-chromium-linux.png
diff --git a/...e-Bond-0eafc--and-it-should-be-save-to-CDXML-specification-2-chromium-linux.png b/...e-Bond-0eafc--and-it-should-be-save-to-CDXML-specification-2-chromium-linux.png
diff --git a/...e-Bond-f1001--and-it-should-be-save-to-CDXML-specification-1-chromium-linux.png b/...e-Bond-f1001--and-it-should-be-save-to-CDXML-specification-1-chromium-linux.png
diff --git a/...e-Reac-46ce5--and-it-should-be-save-to-CDXML-specification-2-chromium-linux.png b/...e-Reac-46ce5--and-it-should-be-save-to-CDXML-specification-2-chromium-linux.png
diff --git a/...e-Reac-cac5a--and-it-should-be-save-to-CDXML-specification-1-chromium-linux.png b/...e-Reac-cac5a--and-it-should-be-save-to-CDXML-specification-1-chromium-linux.png
diff --git a/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts b/ketcher-autotests/tests/File-Management/Open-And-Save-Files/Cml-files/cml-files.spec.ts
@@ -634,7 +634,6 @@ test.describe('CML files', () => {
     /*
   Test case: https://github.com/epam/ketcher/issues/5156
   Description: add new option AVS style and check saving to different format
-  Need to update file after implementing https://github.com/epam/ketcher/issues/5652
   After implementing https://github.com/epam/ketcher/issues/1933 need to update screenshot
   */
     await openFileAndAddToCanvas('KET/layout-with-dif-elements.ket', page);

diff --git a/...hots/CML-files-Open-and-Save-file---CML---CML-for-reaction-1-chromium-linux.png b/...hots/CML-files-Open-and-Save-file---CML---CML-for-reaction-1-chromium-linux.png
diff --git a/...ied-cl-f919a-ut-and-it-should-be-save-to-CML-specification-1-chromium-linux.png b/...ied-cl-f919a-ut-and-it-should-be-save-to-CML-specification-1-chromium-linux.png
diff --git a/...x-opti-35bab-ut-and-it-should-be-save-to-CML-specification-1-chromium-linux.png b/...x-opti-35bab-ut-and-it-should-be-save-to-CML-specification-1-chromium-linux.png
diff --git a/...x-opti-b5890-ut-and-it-should-be-save-to-CML-specification-2-chromium-linux.png b/...x-opti-b5890-ut-and-it-should-be-save-to-CML-specification-2-chromium-linux.png
diff --git a/...size-s-0ada7-ut-and-it-should-be-save-to-CML-specification-2-chromium-linux.png b/...size-s-0ada7-ut-and-it-should-be-save-to-CML-specification-2-chromium-linux.png
diff --git a/...size-s-8b7c0-ut-and-it-should-be-save-to-CML-specification-1-chromium-linux.png b/...size-s-8b7c0-ut-and-it-should-be-save-to-CML-specification-1-chromium-linux.png
diff --git a/...a-with-9c055-us-could-be-saved-to-CML-file-and-loaded-back-1-chromium-linux.png b/...a-with-9c055-us-could-be-saved-to-CML-file-and-loaded-back-1-chromium-linux.png