From 93dfd6478f344186e0fa23fdc9df748703185c5b Mon Sep 17 00:00:00 2001 From: Raathigeshan Date: Wed, 17 Apr 2019 19:55:44 +1000 Subject: [PATCH] Fail proof coverage directory retrival --- server/services/results.ts | 6 +++++- server/static-files.ts | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/server/services/results.ts b/server/services/results.ts index 65b8a65..06b4e18 100644 --- a/server/services/results.ts +++ b/server/services/results.ts @@ -207,7 +207,11 @@ export default class Results { } ); - const filesStr = configProcess.stdout.toString().trim(); + let filesStr = configProcess.stdout.toString().trim(); + if (filesStr === "") { + filesStr = configProcess.stderr.toString().trim(); + } + const jestConfig = JSON.parse(filesStr); this.coverageDirectory = jestConfig.globalConfig && jestConfig.globalConfig.coverageDirectory; diff --git a/server/static-files.ts b/server/static-files.ts index 2f21b74..6c5b86c 100644 --- a/server/static-files.ts +++ b/server/static-files.ts @@ -25,6 +25,8 @@ export function initializeStaticRoutes(express: exp.Application, root: string) { ); pubsub.subscribe("WorspaceInitialized", ({ coverageDirectory }) => { - express.use("/coverage", exp.static(coverageDirectory)); + if (coverageDirectory.trim() !== "") { + express.use("/coverage", exp.static(coverageDirectory)); + } }); }