Merge pull request #2329 from bookwyrm-social/import-admin-fixes

Import admin fixes

bookwyrm/templates/settings/imports/imports.html

@@ -43,6 +43,11 @@
             <th>
                 {% trans "Date Created" %}
             </th>
+            {% if status != "active" %}
+            <th>
+                {% trans "Date Updated" %}
+            </th>
+            {% endif %}
             <th>
                 {% trans "Items" %}
             </th>
@@ -57,9 +62,12 @@
         <tr>
             <td>{{ import.id }}</td>
             <td class="overflow-wrap-anywhere">
-                <a href="{% url 'settings-user' user.id %}">{{ import.user|username }}</a>
+                <a href="{% url 'settings-user' import.user.id %}">{{ import.user|username }}</a>
             </td>
             <td>{{ import.created_date }}</td>
+            {% if status != "active" %}
+            <td>{{ import.updated_date }}</td>
+            {% endif %}
             <td>{{ import.item_count }}</td>
             <td>{{ import.pending_item_count }}</td>
             {% if status == "active" %}
@@ -81,6 +89,6 @@
     </table>
 </div>
 
-{% include 'snippets/pagination.html' with page=users path=request.path %}
+{% include 'snippets/pagination.html' with page=imports path=request.path %}
 {% endblock %}
 

bookwyrm/tests/views/admin/test_celery.py

@@ -14,6 +14,7 @@ from bookwyrm.tests.validate_html import validate_html
 class CeleryStatusViews(TestCase):
     """every response to a get request, html or json"""
 
+    # pylint: disable=invalid-name
     def setUp(self):
         """we need basic test data and mocks"""
         self.factory = RequestFactory()

bookwyrm/tests/views/admin/test_imports.py

@@ -0,0 +1,46 @@
+""" test for app action functionality """
+from unittest.mock import patch
+
+from django.contrib.auth.models import Group
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+from bookwyrm.management.commands import initdb
+from bookwyrm.tests.validate_html import validate_html
+
+
+class ImportsAdminViews(TestCase):
+    """every response to a get request, html or json"""
+
+    # pylint: disable=invalid-name
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_task.delay"
+        ), patch("bookwyrm.lists_stream.populate_lists_task.delay"):
+            self.local_user = models.User.objects.create_user(
+                "mouse@local.com",
+                "mouse@mouse.mouse",
+                "password",
+                local=True,
+                localname="mouse",
+            )
+        initdb.init_groups()
+        initdb.init_permissions()
+        group = Group.objects.get(name="admin")
+        self.local_user.groups.set([group])
+        models.SiteSettings.objects.create()
+
+    def test_celery_status_get(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.ImportList.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)