@testim/testim-cli 3.254.0 → 3.255.0

package/coverage/jsCoverage.js

@@ -1,19 +1,20 @@
 'use strict';
 
-const _ = require('lodash');
-const Bluebird = require('bluebird');
-const servicesApi = require('../commons/testimServicesApi'); const Promise = require('bluebird');
-const fs = Promise.promisifyAll(require('fs'));
+const servicesApi = require('../commons/testimServicesApi');
+const Promise = require('bluebird');
+const fs = require('fs');
+const fsPromises = require('fs/promises');
 const path = require('path');
 const mkdirp = require('mkdirp');
 const lazyRequire = require('../commons/lazyRequire');
 const libReport = require('istanbul-lib-report');
 const reports = require('istanbul-reports');
 const SummaryToObjectReport = require('./SummaryToObjectReport');
-const { ArgError } = require('../errors');
 const ora = require('ora');
 const moment = require('moment');
 const TestExclude = require('test-exclude');
+const { ArgError } = require('../errors');
+const { promiseMap } = require('../utils');
 
 const logger = require('../commons/logger').getLogger('test-run-status');
 
@@ -77,7 +78,7 @@ module.exports.remapCoverage = async (options, storagePath, sourceMaps) => {
             }
             const parsedPath = rewritePath(storagePath, sourcePath);
             await mkdirp(path.parse(parsedPath).dir);
-            await fs.writeFileAsync(parsedPath, sourceMapObject.sourcesContent[index]);
+            await fsPromises.writeFile(parsedPath, sourceMapObject.sourcesContent[index]);
         }));
     }));
 };
@@ -173,11 +174,11 @@ const collectAndMergeJsCoverageData = async (projectId, branch, runId) => {
     const realDataRes = await servicesApi.getRealData(projectId, 'testResult', `runId=${runId}`);
     const testResults = realDataRes.data.docs;
 
-    await Bluebird.map(
-        _.flatten(testResults.map((testResult) => testResult.JSCoverageURLS || [])),
+    await promiseMap(
+        testResults.flatMap((testResult) => testResult.JSCoverageURLS || []),
         async (coverageURL) => {
             const data = await servicesApi.getS3Artifact(coverageURL, 90000);
-            await Bluebird.map(data, async (cov) => {
+            await promiseMap(data, async (cov) => {
                 if (!covUrlMap.has(cov.url)) {
                     let text = cov.text;
                     if (cov.sourceUrl) {
@@ -195,7 +196,8 @@ const collectAndMergeJsCoverageData = async (projectId, branch, runId) => {
                 delete cov.text;
                 mergedCoverages = mergeProcessCovs([mergedCoverages, { result: [cov] }]);
             });
-        }, { concurrency: DOWNLOAD_COVERAGE_DATA_CONCURRENCY }
+        },
+        { concurrency: DOWNLOAD_COVERAGE_DATA_CONCURRENCY }
     );
 
     return { covUrlMap, mergedCoverages };

package/inputFileUtils.js

@@ -1,10 +1,12 @@
 'use strict';
 
 const httpRequest = require('./commons/httpRequest');
-const Promise = require('bluebird');
-const fs = Promise.promisifyAll(require('fs'));
+const fsPromises = require('fs/promises');
 const os = require('os');
-const logger = require('./commons/logger').getLogger('input-file-utils');
+const { promiseMap } = require('./utils');
+const { getLogger } = require('./commons/logger');
+
+const logger = getLogger('input-file-utils');
 
 function getVisibleElementScript(positionAndSize = {
     width: '2px', height: '2px', left: '0px', top: '400px',
@@ -77,22 +79,22 @@ async function downloadFile(fileUrl, fileName) {
     }
 
     const localFileLocation = `${os.tmpdir()}/${fileName}`;
-    await fs.writeFileAsync(localFileLocation, body);
+    await fsPromises.writeFile(localFileLocation, body);
     return localFileLocation;
 }
 
 function downloadFiles(fileUrls) {
-    return Promise.map(fileUrls, file => downloadFile(file.url, file.name));
+    return promiseMap(fileUrls, file => downloadFile(file.url, file.name));
 }
 
 function uploadFileToGrid(localFileLocation, uploadFileFn) {
     return uploadFileFn(localFileLocation);
 }
 
-function downloadFilesAndUploadToGrid(fileUrls, uploadFileFn) {
-    return downloadFiles(fileUrls)
-        .then(filesOnDisk => Promise.map(filesOnDisk, localFileLocation => uploadFileToGrid(localFileLocation, uploadFileFn)))
-        .then(gridLocalFiles => Array.isArray(gridLocalFiles) && gridLocalFiles.map(gridLocalFile => gridLocalFile && gridLocalFile.value));
+async function downloadFilesAndUploadToGrid(fileUrls, uploadFileFn) {
+    const filesOnDisk = await downloadFiles(fileUrls);
+    const gridLocalFiles = await promiseMap(filesOnDisk, localFileLocation => uploadFileToGrid(localFileLocation, uploadFileFn));
+    return Array.isArray(gridLocalFiles) && gridLocalFiles.map(gridLocalFile => gridLocalFile?.value);
 }
 
 module.exports = {