Fix cleanup function

Author: VladislavKostyukevich

e2e/specs/audit/auditDashboard.spec.ts

@@ -5,6 +5,7 @@ import { projectList } from '../../pages/project/list.po';
 import { dateUtil } from '../../utils/date.util';
 import using from 'jasmine-data-provider';
 import users from '../../data/users.json';
+import { logger } from '../../utils/log.util';
 
 const editorExamples = {
     auditAdmin: users.auditAdmin,
@@ -25,7 +26,7 @@ const getLastSubmittedAuditsfileName = (): string => {
     return `Aquality_Tracking_Last_Submitted_Audits_${dateUtil.getDateFormat()}.xlsx`;
 };
 
-describe('Audits Dashboard:', () => {
+fdescribe('Audits Dashboard:', () => {
     using(notEditorExamples, (user, description) => {
         describe(`${description} role:`, () => {
             it(`Is not available for role ${description}`, async () => {
@@ -51,14 +52,14 @@ describe('Audits Dashboard:', () => {
                 await auditsDashboardPage.exportAllSubmittedAudits();
                 return expect(
                     await testData.waitUntilFileExists(testData.getSimpleDownloadsFolderPath(), getAllSubmittedAuditsfileName()))
-                    .toBe(true, 'All submitted audits should be exported to file');
+                    .toBe(true, `All submitted audits should be exported to file: ${getAllSubmittedAuditsfileName()}`);
             });
 
             it('Can export last submitted audits', async () => {
                 await auditsDashboardPage.exportLastSubmittedAudits();
                 return expect(
                     await testData.waitUntilFileExists(testData.getSimpleDownloadsFolderPath(), getLastSubmittedAuditsfileName()))
-                    .toBe(true, 'Last submitted audits should be exported to file');
+                    .toBe(true, `Last submitted audits should be exported to file: ${getLastSubmittedAuditsfileName()}`);
             });
         });
     });

e2e/utils/testData.util.ts

@@ -21,7 +21,9 @@ class TestData {
      * @return {string} full path
      */
     getFullPath(pathFromDataFolder: string): string {
-        return path.join(__dirname, '..', dataFolderName, pathFromDataFolder);
+        const fullPath = path.join(__dirname, '..', dataFolderName, pathFromDataFolder);
+        logger.info(`Full path from data folder: ${fullPath}`);
+        return fullPath;
     }
 
     /**
@@ -56,19 +58,27 @@ class TestData {
      */
     cleanUpDownloadsData() {
         const downloadsPath = this.getFullPath(`/${downloadsFolderName}`);
-        return new Promise((resolve) => {
+        return new Promise((resolve, reject) => {
             logger.info('Running Downloads Clean UP!');
-            if (fs.existsSync(downloadsPath)) {
-                fs.readdirSync(downloadsPath).forEach(function (file, index) {
-                    const curPath = downloadsPath + '/' + file;
-                    if (fs.lstatSync(curPath).isDirectory()) {
-                        this.deleteFolderRecursive(curPath);
-                    } else {
-                        fs.unlinkSync(curPath);
-                    }
-                });
-                resolve();
+            try {
+                if (fs.existsSync(downloadsPath)) {
+                    logger.info('Downloads folder Exists');
+                    fs.readdirSync(downloadsPath).forEach(function (file, index) {
+                        logger.info(`Processing ${file}`);
+                        const curPath = path.join(downloadsPath, file);
+                        if (fs.lstatSync(curPath).isDirectory()) {
+                            logger.info(`Removing directory '${file}'`);
+                            this.deleteFolderRecursive(curPath);
+                        } else {
+                            logger.info(`Removing file '${file}'`);
+                            fs.unlinkSync(curPath);
+                        }
+                    });
+                }
+            } catch (error) {
+                reject(`Was not able to clean up the downloads folder: ${error.message}`);
             }
+            resolve();
         });
     }