Merge pull request #723 from gemini-testing/TESTPLANE-718.fix_merge_reports

fix: correctly merge report even if request for databaseUrls.json failed

Author: DudaGod

lib/merge-reports/index.ts

@@ -40,15 +40,15 @@ export const mergeReports = async (toolAdapter: ToolAdapter, srcPaths: string[],
     const parsedHeaders = {...headersFromCli, ...headersFromEnv};
 
     const resolvedUrls = await tryResolveUrls(srcPaths, parsedHeaders);
-    const resolvedDbFiles = resolvedUrls.filter(serverUtils.isDbFile);
+    const {true: resolvedDbFiles = [], false: resolvedJsonUrls = []} = _.groupBy(resolvedUrls, serverUtils.isDbFile);
 
     const {true: remoteDbUrls = [], false: localDbPaths = []} = _.groupBy(resolvedDbFiles, isUrl);
     const dbPaths: DbPath[] = localDbPaths.map((db: string, ind: number, arr: string[]) => {
         const dbName = arr.length > 1 ? genUniqDbName(db, ind + 1) : path.basename(db);
         return {src: path.resolve(process.cwd(), db), dest: path.resolve(destPath, dbName)};
     });
 
-    const allDbPaths = [...remoteDbUrls, ...dbPaths.map(({dest}) => path.parse(dest).base)];
+    const dbAndJsonUrls = [...resolvedJsonUrls, ...remoteDbUrls, ...dbPaths.map(({dest}) => path.parse(dest).base)];
     const copyFilePromises: Promise<void>[] = [];
 
     await fs.ensureDir(destPath);
@@ -66,7 +66,7 @@ export const mergeReports = async (toolAdapter: ToolAdapter, srcPaths: string[],
 
     await Promise.all([
         serverUtils.saveStaticFilesToReportDir(htmlReporter, reporterConfig, destPath),
-        serverUtils.writeDatabaseUrlsFile(destPath, allDbPaths),
+        serverUtils.writeDatabaseUrlsFile(destPath, dbAndJsonUrls),
         ...copyFilePromises
     ]);
 

test/unit/lib/merge-reports/index.js

@@ -226,6 +226,18 @@ describe('lib/merge-reports', () => {
         });
     });
 
+    it('should add json url to merged report even if request for it is failed', async () => {
+        const toolAdapter = stubToolAdapter({htmlReporter});
+        const paths = ['https://ci.ru'];
+        const destPath = 'dest-report/path';
+
+        axiosStub.get.withArgs('https://ci.ru/databaseUrls.json').rejects(new Error('o.O'));
+
+        await execMergeReports_({toolAdapter, paths, opts: {destPath, headers: []}});
+
+        assert.calledOnceWith(serverUtils.writeDatabaseUrlsFile, destPath, ['https://ci.ru/databaseUrls.json']);
+    });
+
     it('should merge reports with folder paths', async () => {
         const toolAdapter = stubToolAdapter({htmlReporter});
         const paths = ['https://ci.ru', 'src-report-1'];