diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/admin_changelist/tests.py | 2 | ||||
| -rw-r--r-- | tests/admin_utils/test_logentry.py | 32 | ||||
| -rw-r--r-- | tests/admin_views/test_history_view.py | 1 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 3 |
4 files changed, 30 insertions, 8 deletions
diff --git a/tests/admin_changelist/tests.py b/tests/admin_changelist/tests.py index 17866c8ad6..6003ce47d8 100644 --- a/tests/admin_changelist/tests.py +++ b/tests/admin_changelist/tests.py @@ -1845,7 +1845,7 @@ class GetAdminLogTests(TestCase): """{% get_admin_log %} works without specifying a user.""" user = User(username="jondoe", password="secret", email="super@example.com") user.save() - LogEntry.objects.log_actions(user.pk, [user], 1, single_object=True) + LogEntry.objects.log_actions(user.pk, [user], 1) context = Context({"log_entries": LogEntry.objects.all()}) t = Template( "{% load log %}" diff --git a/tests/admin_utils/test_logentry.py b/tests/admin_utils/test_logentry.py index 491a220199..7ba43c4ba0 100644 --- a/tests/admin_utils/test_logentry.py +++ b/tests/admin_utils/test_logentry.py @@ -5,6 +5,7 @@ from django.contrib.admin.models import ADDITION, CHANGE, DELETION, LogEntry from django.contrib.admin.utils import quote from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType +from django.db.models.signals import post_save, pre_save from django.test import TestCase, override_settings from django.urls import reverse from django.utils import translation @@ -41,11 +42,23 @@ class LogEntryTests(TestCase): [cls.a1], CHANGE, change_message="Changed something", - single_object=True, ) def setUp(self): self.client.force_login(self.user) + self.signals = [] + + pre_save.connect(self.pre_save_listener, sender=LogEntry) + self.addCleanup(pre_save.disconnect, self.pre_save_listener, sender=LogEntry) + + post_save.connect(self.post_save_listener, sender=LogEntry) + self.addCleanup(post_save.disconnect, self.post_save_listener, sender=LogEntry) + + def pre_save_listener(self, instance, **kwargs): + self.signals.append(("pre_save", instance)) + + def post_save_listener(self, instance, created, **kwargs): + self.signals.append(("post_save", instance, created)) def test_logentry_save(self): """ @@ -271,6 +284,7 @@ class LogEntryTests(TestCase): for obj in queryset ] self.assertSequenceEqual(logs, expected_log_values) + self.assertEqual(self.signals, []) def test_recentactions_without_content_type(self): """ @@ -314,6 +328,8 @@ class LogEntryTests(TestCase): "created_1": "00:00", } changelist_url = reverse("admin:admin_utils_articleproxy_changelist") + expected_signals = [] + self.assertEqual(self.signals, expected_signals) # add proxy_add_url = reverse("admin:admin_utils_articleproxy_add") @@ -322,6 +338,10 @@ class LogEntryTests(TestCase): proxy_addition_log = LogEntry.objects.latest("id") self.assertEqual(proxy_addition_log.action_flag, ADDITION) self.assertEqual(proxy_addition_log.content_type, proxy_content_type) + expected_signals.extend( + [("pre_save", proxy_addition_log), ("post_save", proxy_addition_log, True)] + ) + self.assertEqual(self.signals, expected_signals) # change article_id = proxy_addition_log.object_id @@ -334,6 +354,10 @@ class LogEntryTests(TestCase): proxy_change_log = LogEntry.objects.latest("id") self.assertEqual(proxy_change_log.action_flag, CHANGE) self.assertEqual(proxy_change_log.content_type, proxy_content_type) + expected_signals.extend( + [("pre_save", proxy_change_log), ("post_save", proxy_change_log, True)] + ) + self.assertEqual(self.signals, expected_signals) # delete proxy_delete_url = reverse( @@ -344,6 +368,10 @@ class LogEntryTests(TestCase): proxy_delete_log = LogEntry.objects.latest("id") self.assertEqual(proxy_delete_log.action_flag, DELETION) self.assertEqual(proxy_delete_log.content_type, proxy_content_type) + expected_signals.extend( + [("pre_save", proxy_delete_log), ("post_save", proxy_delete_log, True)] + ) + self.assertEqual(self.signals, expected_signals) def test_action_flag_choices(self): tests = ((1, "Addition"), (2, "Change"), (3, "Deletion")) @@ -358,7 +386,6 @@ class LogEntryTests(TestCase): [self.a1], CHANGE, change_message="Article changed message", - single_object=True, ) c1 = Car.objects.create() LogEntry.objects.log_actions( @@ -366,7 +393,6 @@ class LogEntryTests(TestCase): [c1], ADDITION, change_message="Car created message", - single_object=True, ) exp_str_article = escape(str(self.a1)) exp_str_car = escape(str(c1)) diff --git a/tests/admin_views/test_history_view.py b/tests/admin_views/test_history_view.py index dfac3530bf..7079c1d0d8 100644 --- a/tests/admin_views/test_history_view.py +++ b/tests/admin_views/test_history_view.py @@ -66,7 +66,6 @@ class SeleniumTests(AdminSeleniumTestCase): [self.superuser], CHANGE, change_message=f"Changed something {i}", - single_object=True, ) self.admin_login( username="super", diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 1fa2c62353..5e1aa719c1 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -3884,21 +3884,18 @@ class AdminViewStringPrimaryKeyTest(TestCase): [cls.m1], 2, change_message="Changed something", - single_object=True, ) LogEntry.objects.log_actions( user_pk, [cls.m1], 1, change_message="Added something", - single_object=True, ) LogEntry.objects.log_actions( user_pk, [cls.m1], 3, change_message="Deleted something", - single_object=True, ) def setUp(self): |