Merge pull request #2942 from tobespc/issue2937

[0.12.0] add correct endpoint for spring and add tests
eclipse-archived · May 14, 2020 · 7286bfd · 7286bfd
2 parents 2114e69 + 1d572f8
commit 7286bfd
Show file tree

Hide file tree

Showing 6 changed files with 632 additions and 461 deletions.
diff --git a/src/pfe/portal/modules/utils/metricsStatusChecker.js b/src/pfe/portal/modules/utils/metricsStatusChecker.js
@@ -38,7 +38,7 @@ const VALID_METRIC_ENDPOINT = {
     hosting: METRICS_DASH_HOST.project,
   },
   javametricsDash: {
-    endpoint: '/javametrics-dash',
+    endpoint: '/javametrics-dash/',
     hosting: METRICS_DASH_HOST.project,
   },
   swiftmetricsDash: {
@@ -248,7 +248,7 @@ function getMetricsDashboardHostAndPath(endpoints, projectID, projectLanguage) {
 
 function getDashboardPath(metricsDashHost, projectMetricEndpoint, projectID, language, injectMetrics) {
   if (metricsDashHost === METRICS_DASH_HOST.project && !injectMetrics) {
-    return `${projectMetricEndpoint}/?theme=dark`;
+    return path.join(projectMetricEndpoint, '?theme=dark');
   }
 
   // Currently we only support java and nodejs on the performance dashboard