EPMRPP-84451 || Rewrite the getAttachments utility to be fully async

reportportal · Mar 27, 2024 · 059c6de · 059c6de
1 parent 9ece26c
commit 059c6de
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/src/__tests__/utils.spec.ts b/src/__tests__/utils.spec.ts
@@ -26,6 +26,7 @@ import {
   isFalse,
   getAttachments,
   isErrorLog,
+  fileExists,
   calculateRpStatus,
 } from '../utils';
 import fs from 'fs';
@@ -56,6 +57,23 @@ describe('testing utils', () => {
     });
   });
 
+  describe('fileExists', () => {
+    test('should return true', async () => {
+      jest.spyOn(fs.promises, 'stat').mockImplementationOnce(() => Promise.resolve({} as fs.Stats));
+
+      const existingFilePath = 'existing-file-path';
+      const isFileExist = await fileExists(existingFilePath);
+
+      expect(isFileExist).toBe(true);
+    });
+    test('should return false', async () => {
+      const notExistingFilePath = 'not-existing-file-path';
+      const isFileExist = await fileExists(notExistingFilePath);
+
+      expect(isFileExist).toBe(false);
+    });
+  });
+
   describe('promiseErrorHandler', () => {
     let spyConsoleError: jest.SpyInstance;
     beforeEach(() => {
@@ -242,7 +260,7 @@ describe('testing utils', () => {
       const file1Data = Buffer.from([1, 2, 3, 4, 5, 6, 7, 8]);
       const file2Data = Buffer.from([1, 2, 3, 4, 5, 6, 7]);
 
-      jest.spyOn(fs, 'existsSync').mockImplementationOnce((): boolean => true);
+      jest.spyOn(fs.promises, 'stat').mockImplementationOnce(() => Promise.resolve({} as fs.Stats));
 
       jest.spyOn(fs.promises, 'readFile').mockImplementationOnce(async () => file1Data);
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -122,7 +122,8 @@ export const getAttachments = async (
         if (body) {
           fileContent = body;
         } else {
-          if (!fs.existsSync(attachmentPath)) {
+          const isFileExist = await fileExists(attachmentPath);
+          if (!isFileExist) {
             return;
           }
           fileContent = await fsPromises.readFile(attachmentPath);
@@ -142,6 +143,19 @@ export const getAttachments = async (
   return (await Promise.all(readFilePromises)).filter(Boolean);
 };
 
+export const fileExists = async (path: string) => {
+  try {
+    await fsPromises.stat(path);
+    return true;
+  } catch (error) {
+    if (error.code === 'ENOENT') { // File does not exist
+      return false;
+    } else {
+      throw error;
+    }
+  }
+}
+
 export const isErrorLog = (message: string): boolean => {
   return message.toLowerCase().includes('error');
 };