Fixed #29917 -- Stopped collecting ModelAdmin.actions from base ModelAdmins.

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/modeladmin/test_actions.py b/tests/modeladmin/test_actions.py
index 17b3c324d2..a33c1811b2 100644
--- a/tests/modeladmin/test_actions.py
+++ b/tests/modeladmin/test_actions.py
@@ -55,3 +55,24 @@ class AdminActionsTests(TestCase):
                 mock_request.user = user
                 actions = ma.get_actions(mock_request)
                 self.assertEqual(list(actions.keys()), expected)
+
+    def test_actions_inheritance(self):
+        class AdminBase(admin.ModelAdmin):
+            actions = ['custom_action']
+
+            def custom_action(modeladmin, request, queryset):
+                pass
+
+        class AdminA(AdminBase):
+            pass
+
+        class AdminB(AdminBase):
+            actions = None
+
+        ma1 = AdminA(Band, admin.AdminSite())
+        action_names = [name for _, name, _ in ma1._get_base_actions()]
+        self.assertEqual(action_names, ['delete_selected', 'custom_action'])
+        # `actions = None` removes actions from superclasses.
+        ma2 = AdminB(Band, admin.AdminSite())
+        action_names = [name for _, name, _ in ma2._get_base_actions()]
+        self.assertEqual(action_names, ['delete_selected'])