diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html index 81f0daa5..314a6861 100644 --- a/bookwyrm/templates/import/import.html +++ b/bookwyrm/templates/import/import.html @@ -46,10 +46,10 @@
-
diff --git a/bookwyrm/templates/import/import_status.html b/bookwyrm/templates/import/import_status.html index 1c073944..91e48e34 100644 --- a/bookwyrm/templates/import/import_status.html +++ b/bookwyrm/templates/import/import_status.html @@ -10,18 +10,17 @@

{% trans "Import Status" %}

{% trans "Back to imports" %} + {% if task.failed %} +
{% trans "TASK FAILED" %}
+ {% endif %} +
-
-
{% trans "Import started:" %}
-
{{ job.created_date | naturaltime }}
-
+
{% trans "Import started:" %}
+
{{ job.created_date | naturaltime }}
+ {% if job.complete %} -
-
{% trans "Import completed:" %}
-
{{ task.date_done | naturaltime }}
-
- {% elif task.failed %} -
{% trans "TASK FAILED" %}
+
{% trans "Import completed:" %}
+
{{ task.date_done | naturaltime }}
{% endif %}
diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py index 2027d284..1411a5a8 100644 --- a/bookwyrm/tests/views/test_import.py +++ b/bookwyrm/tests/views/test_import.py @@ -5,6 +5,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from bookwyrm.tests.validate_html import validate_html from bookwyrm import forms, models, views @@ -34,7 +35,7 @@ class ImportViews(TestCase): request.user = self.local_user result = view(request) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_import_status(self): @@ -47,7 +48,7 @@ class ImportViews(TestCase): async_result.return_value = [] result = view(request, import_job.id) self.assertIsInstance(result, TemplateResponse) - result.render() + validate_html(result.render()) self.assertEqual(result.status_code, 200) def test_start_import(self): @@ -59,7 +60,10 @@ class ImportViews(TestCase): form.data["include_reviews"] = False csv_file = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") form.data["csv_file"] = SimpleUploadedFile( - csv_file, open(csv_file, "rb").read(), content_type="text/csv" + # pylint: disable=consider-using-with + csv_file, + open(csv_file, "rb").read(), + content_type="text/csv", ) request = self.factory.post("", form.data)