|
7 | 7 | from django.contrib.sites.models import Site |
8 | 8 | from django.shortcuts import reverse |
9 | 9 | from django.test import RequestFactory, override_settings |
| 10 | +from djangocms_versioning.admin import ExtendedIndicatorVersionAdminMixin |
10 | 11 |
|
11 | 12 | try: |
12 | 13 | from djangocms_versioning.models import Version |
@@ -90,13 +91,23 @@ def test_admin_list_display_with_versioning(self): |
90 | 91 | With versioning enabled, list_display should be populated with both versioning related items, and the |
91 | 92 | list actions items |
92 | 93 | """ |
93 | | - from djangocms_versioning.admin import ExtendedVersionAdminMixin |
94 | | - |
95 | 94 | list_display = self.snippet_admin.get_list_display(self.snippet_admin_request) |
96 | 95 |
|
97 | 96 | # Mixins should always come first in the class bases |
98 | | - self.assertEqual(self.snippet_admin.__class__.__bases__, (ExtendedVersionAdminMixin, admin.ModelAdmin)) |
99 | | - self.assertEqual(list_display[:-1], ("name", "get_author", "get_modified_date", "get_versioning_state")) |
| 97 | + self.assertEqual( |
| 98 | + self.snippet_admin.__class__.__bases__, |
| 99 | + (ExtendedIndicatorVersionAdminMixin, admin.ModelAdmin), |
| 100 | + ) |
| 101 | + |
| 102 | + # Verify static fields |
| 103 | + self.assertEqual(list_display[:3], ("name", "get_author", "get_modified_date")) |
| 104 | + |
| 105 | + # Verify dynamic indicator |
| 106 | + indicator_field = list_display[3] |
| 107 | + self.assertTrue(callable(indicator_field), f"{indicator_field} is not callable") |
| 108 | + self.assertEqual(indicator_field.__name__, "indicator") |
| 109 | + |
| 110 | + # Verify actions |
100 | 111 | self.assertEqual(list_display[-1].short_description.lower(), "actions") |
101 | 112 |
|
102 | 113 | def test_admin_uses_form(self): |
@@ -228,7 +239,7 @@ def test_admin_form_edit_when_locked(self): |
228 | 239 | self.assertEqual(Snippet.objects.count(), 1) |
229 | 240 |
|
230 | 241 | @override_settings(DJANGOCMS_SNIPPET_VERSIONING_ENABLED=False) |
231 | | - def test_slug_colomn_should_hyperlinked_with_versioning_disabled(self): |
| 242 | + def test_slug_column_should_hyperlinked_with_versioning_disabled(self): |
232 | 243 | """ |
233 | 244 | Slug column should be visible and hyperlinked when versioning is disabled |
234 | 245 | """ |
|
0 commit comments