From 46ad958235a99a8f425f7af502fabfd690ba5f0b Mon Sep 17 00:00:00 2001 From: enudler Date: Fri, 25 Sep 2020 19:45:42 +0300 Subject: [PATCH] Feat/grafanatestrunid (#410) --- src/reports/models/reportsManager.js | 2 +- tests/unit-tests/reporter/models/reportsManager-test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/reports/models/reportsManager.js b/src/reports/models/reportsManager.js index 4763240d5..51bfdd0b1 100644 --- a/src/reports/models/reportsManager.js +++ b/src/reports/models/reportsManager.js @@ -162,7 +162,7 @@ function getReportResponse(summaryRow, config) { function generateGrafanaUrl(report, grafanaUrl) { if (grafanaUrl) { const endTimeGrafanafaQuery = report.end_time ? `&to=${new Date(report.end_time).getTime()}` : '&to=now'; - const grafanaReportUrl = encodeURI(grafanaUrl + `&var-Name=${report.test_name}&from=${new Date(report.start_time).getTime()}${endTimeGrafanafaQuery}`); + const grafanaReportUrl = encodeURI(grafanaUrl + `&var-Name=${report.test_name}&var-TestRunId=${report.report_id}&from=${new Date(report.start_time).getTime()}${endTimeGrafanafaQuery}`); return grafanaReportUrl; } } diff --git a/tests/unit-tests/reporter/models/reportsManager-test.js b/tests/unit-tests/reporter/models/reportsManager-test.js index 0f653cf06..32ad82e6d 100644 --- a/tests/unit-tests/reporter/models/reportsManager-test.js +++ b/tests/unit-tests/reporter/models/reportsManager-test.js @@ -146,7 +146,7 @@ describe('Reports manager tests', function () { const report = await manager.getReport(); should.exist(report); should.exist(report.grafana_report); - should(report.grafana_report).eql('http://www.grafana.com&var-Name=test%20name&from=1527533459591&to=now'); + should(report.grafana_report).eql('http://www.grafana.com&var-Name=test%20name&var-TestRunId=report_id&from=1527533459591&to=now'); }); it('Database connector returns an array with one report and score ', async () => {