From 28443960a55dc1073ce9a857a81140ad38731844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= Date: Wed, 26 Jul 2023 01:39:15 +0200 Subject: [PATCH] Chore: General JS cleanup --- src/pytest_html/basereport.py | 45 ++++++-------------------- src/pytest_html/report_data.py | 1 - src/pytest_html/resources/index.jinja2 | 12 ++----- src/pytest_html/scripts/datamanager.js | 20 +++--------- src/pytest_html/scripts/dom.js | 8 ++--- src/pytest_html/scripts/index.js | 2 +- src/pytest_html/scripts/main.js | 25 ++++++-------- src/pytest_html/scripts/mediaviewer.js | 3 ++ src/pytest_html/scripts/storage.js | 18 +++++------ 9 files changed, 40 insertions(+), 94 deletions(-) diff --git a/src/pytest_html/basereport.py b/src/pytest_html/basereport.py index 10a94165..045ebcdc 100644 --- a/src/pytest_html/basereport.py +++ b/src/pytest_html/basereport.py @@ -46,15 +46,18 @@ def _asset_filename(self, test_id, extra_index, test_index, file_extension): def _generate_report(self, self_contained=False): generated = datetime.datetime.now() - rendered_report = self._render_html( - generated.strftime("%d-%b-%Y"), - generated.strftime("%H:%M:%S"), - __version__, - self.css, + test_data = cleanup_unserializable(self._report.data) + test_data = json.dumps(test_data) + rendered_report = self._template.render( + title=self._report.title, + date=generated.strftime("%d-%b-%Y"), + time=generated.strftime("%H:%M:%S"), + version=__version__, + styles=self.css, run_count=self._run_count(), self_contained=self_contained, outcomes=self._report.data["outcomes"], - test_data=cleanup_unserializable(self._report.data), + test_data=test_data, table_head=self._report.data["resultsTableHeader"], prefix=self._report.data["additionalSummary"]["prefix"], summary=self._report.data["additionalSummary"]["summary"], @@ -118,36 +121,6 @@ def _process_extras(self, report, test_id): return report_extras - def _render_html( - self, - date, - time, - version, - styles, - run_count, - self_contained, - outcomes, - test_data, - table_head, - summary, - prefix, - postfix, - ): - return self._template.render( - date=date, - time=time, - version=version, - styles=styles, - run_count=run_count, - self_contained=self_contained, - outcomes=outcomes, - test_data=json.dumps(test_data), - table_head=table_head, - summary=summary, - prefix=prefix, - postfix=postfix, - ) - def _write_report(self, rendered_report): with self._report_path.open("w", encoding="utf-8") as f: f.write(rendered_report) diff --git a/src/pytest_html/report_data.py b/src/pytest_html/report_data.py index d1e9183f..afef1871 100644 --- a/src/pytest_html/report_data.py +++ b/src/pytest_html/report_data.py @@ -29,7 +29,6 @@ def __init__(self, config): } self._data = { - "title": "", "collectedItems": 0, "totalDuration": 0, "runningState": "not_started", diff --git a/src/pytest_html/resources/index.jinja2 b/src/pytest_html/resources/index.jinja2 index 29ef9b69..dc96ce48 100644 --- a/src/pytest_html/resources/index.jinja2 +++ b/src/pytest_html/resources/index.jinja2 @@ -2,7 +2,7 @@ - + {{ title }} {%- if self_contained %}