diff --git a/bookwyrm/templates/import/import_status.html b/bookwyrm/templates/import/import_status.html
index 6370b866a..ddeeeb310 100644
--- a/bookwyrm/templates/import/import_status.html
+++ b/bookwyrm/templates/import/import_status.html
@@ -47,7 +47,7 @@
{% trans "In progress" %}
- {% trans "Refresh" %}
+ {% trans "Refresh" %}
diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py
index 3fbfa2648..5c3b20310 100644
--- a/bookwyrm/tests/importers/test_importer.py
+++ b/bookwyrm/tests/importers/test_importer.py
@@ -1,5 +1,4 @@
""" testing import """
-from collections import namedtuple
import pathlib
from unittest.mock import patch
import datetime
@@ -104,13 +103,9 @@ class GenericImporter(TestCase):
import_job = self.importer.create_job(
self.local_user, self.csv, False, "unlisted"
)
- MockTask = namedtuple("Task", ("id"))
- mock_task = MockTask(7)
- with patch("bookwyrm.importers.importer.start_import_task.delay") as start:
- start.return_value = mock_task
+ with patch("bookwyrm.importers.importer.start_import_task.delay") as mock:
self.importer.start_import(import_job)
- import_job.refresh_from_db()
- self.assertEqual(import_job.task_id, "7")
+ self.assertEqual(mock.call_count, 1)
@responses.activate
def test_start_import_task(self, *_):
@@ -150,28 +145,25 @@ class GenericImporter(TestCase):
import_job = self.importer.create_job(
self.local_user, self.csv, False, "unlisted"
)
- item = import_job.items[0]
- item.update_job()
- self.assertFalse(
- models.Notification.objects.filter(
- user=self.local_user,
- related_import=import_job,
- notification_type="IMPORT",
- ).exists()
- )
+ items = import_job.items.all()
+ for item in items[:3]:
+ item.fail_reason = "hello"
+ item.save()
+ item.update_job()
+ self.assertFalse(
+ models.Notification.objects.filter(
+ user=self.local_user,
+ related_import=import_job,
+ notification_type="IMPORT",
+ ).exists()
+ )
- item = import_job.items[1]
- item.update_job()
- self.assertFalse(
- models.Notification.objects.filter(
- user=self.local_user,
- related_import=import_job,
- notification_type="IMPORT",
- ).exists()
- )
-
- item = import_job.items[2]
+ item = items[3]
+ item.fail_reason = "hello"
+ item.save()
item.update_job()
+ import_job.refresh_from_db()
+ self.assertTrue(import_job.complete)
self.assertTrue(
models.Notification.objects.filter(
user=self.local_user,