diff options
Diffstat (limited to 'tests/modeladmin')
| -rw-r--r-- | tests/modeladmin/test_actions.py | 15 | ||||
| -rw-r--r-- | tests/modeladmin/test_checks.py | 11 |
2 files changed, 17 insertions, 9 deletions
diff --git a/tests/modeladmin/test_actions.py b/tests/modeladmin/test_actions.py index f7de725ffc..b61641c0c9 100644 --- a/tests/modeladmin/test_actions.py +++ b/tests/modeladmin/test_actions.py @@ -27,6 +27,7 @@ class AdminActionsTests(TestCase): class BandAdmin(admin.ModelAdmin): actions = ['custom_action'] + @admin.action def custom_action(modeladmin, request, queryset): pass @@ -60,6 +61,7 @@ class AdminActionsTests(TestCase): class AdminBase(admin.ModelAdmin): actions = ['custom_action'] + @admin.action def custom_action(modeladmin, request, queryset): pass @@ -78,13 +80,14 @@ class AdminActionsTests(TestCase): self.assertEqual(action_names, ['delete_selected']) def test_global_actions_description(self): + @admin.action(description='Site-wide admin action 1.') def global_action_1(modeladmin, request, queryset): pass + @admin.action def global_action_2(modeladmin, request, queryset): pass - global_action_1.short_description = 'Site-wide admin action 1.' admin_site = admin.AdminSite() admin_site.add_action(global_action_1) admin_site.add_action(global_action_2) @@ -103,30 +106,28 @@ class AdminActionsTests(TestCase): ) def test_actions_replace_global_action(self): + @admin.action(description='Site-wide admin action 1.') def global_action_1(modeladmin, request, queryset): pass + @admin.action(description='Site-wide admin action 2.') def global_action_2(modeladmin, request, queryset): pass - global_action_1.short_description = 'Site-wide admin action 1.' - global_action_2.short_description = 'Site-wide admin action 2.' admin.site.add_action(global_action_1, name='custom_action_1') admin.site.add_action(global_action_2, name='custom_action_2') + @admin.action(description='Local admin action 1.') def custom_action_1(modeladmin, request, queryset): pass - custom_action_1.short_description = 'Local admin action 1.' - class BandAdmin(admin.ModelAdmin): actions = [custom_action_1, 'custom_action_2'] + @admin.action(description='Local admin action 2.') def custom_action_2(self, request, queryset): pass - custom_action_2.short_description = 'Local admin action 2.' - ma = BandAdmin(Band, admin.site) self.assertEqual(ma.check(), []) self.assertEqual( diff --git a/tests/modeladmin/test_checks.py b/tests/modeladmin/test_checks.py index 308f4a19eb..d81cc3dd32 100644 --- a/tests/modeladmin/test_checks.py +++ b/tests/modeladmin/test_checks.py @@ -1,4 +1,5 @@ from django import forms +from django.contrib import admin from django.contrib.admin import BooleanFieldListFilter, SimpleListFilter from django.contrib.admin.options import VERTICAL, ModelAdmin, TabularInline from django.contrib.admin.sites import AdminSite @@ -499,10 +500,12 @@ class ListDisplayTests(CheckTestCase): ) def test_valid_case(self): + @admin.display def a_callable(obj): pass class TestModelAdmin(ModelAdmin): + @admin.display def a_method(self, obj): pass list_display = ('name', 'decade_published_in', 'a_method', a_callable) @@ -563,10 +566,12 @@ class ListDisplayLinksCheckTests(CheckTestCase): ) def test_valid_case(self): + @admin.display def a_callable(obj): pass class TestModelAdmin(ModelAdmin): + @admin.display def a_method(self, obj): pass list_display = ('name', 'decade_published_in', 'a_method', a_callable) @@ -1417,11 +1422,10 @@ class AutocompleteFieldsTests(CheckTestCase): class ActionsCheckTests(CheckTestCase): def test_custom_permissions_require_matching_has_method(self): + @admin.action(permissions=['custom']) def custom_permission_action(modeladmin, request, queryset): pass - custom_permission_action.allowed_permissions = ('custom',) - class BandAdmin(ModelAdmin): actions = (custom_permission_action,) @@ -1433,6 +1437,7 @@ class ActionsCheckTests(CheckTestCase): ) def test_actions_not_unique(self): + @admin.action def action(modeladmin, request, queryset): pass @@ -1447,9 +1452,11 @@ class ActionsCheckTests(CheckTestCase): ) def test_actions_unique(self): + @admin.action def action1(modeladmin, request, queryset): pass + @admin.action def action2(modeladmin, request, queryset): pass |