summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/comment_tests/tests/moderation_view_tests.py11
-rw-r--r--tests/regressiontests/comment_tests/urls_admin.py6
2 files changed, 17 insertions, 0 deletions
diff --git a/tests/regressiontests/comment_tests/tests/moderation_view_tests.py b/tests/regressiontests/comment_tests/tests/moderation_view_tests.py
index ef79b4dc15..e5094ab0cc 100644
--- a/tests/regressiontests/comment_tests/tests/moderation_view_tests.py
+++ b/tests/regressiontests/comment_tests/tests/moderation_view_tests.py
@@ -190,3 +190,14 @@ class AdminActionsTests(CommentTestCase):
self.client.login(username="normaluser", password="normaluser")
response = self.client.get("/admin/comments/comment/")
self.assertEquals("approve_comments" in response.content, True)
+
+ def testActionsDisabledDelete(self):
+ "Tests a CommentAdmin where 'delete_selected' has been disabled."
+ comments = self.createSomeComments()
+ self.client.login(username="normaluser", password="normaluser")
+ response = self.client.get('/admin2/comments/comment/')
+ self.assertEqual(response.status_code, 200)
+ self.assert_(
+ '<option value="delete_selected">' not in response.content,
+ "Found an unexpected delete_selected in response"
+ )
diff --git a/tests/regressiontests/comment_tests/urls_admin.py b/tests/regressiontests/comment_tests/urls_admin.py
index 341285d7ef..d7e1a4e916 100644
--- a/tests/regressiontests/comment_tests/urls_admin.py
+++ b/tests/regressiontests/comment_tests/urls_admin.py
@@ -8,6 +8,12 @@ from django.contrib.comments.models import Comment
admin_site = admin.AdminSite()
admin_site.register(Comment, CommentsAdmin)
+# To demonstrate proper functionality even when ``delete_selected`` is removed.
+admin_site2 = admin.AdminSite()
+admin_site2.disable_action('delete_selected')
+admin_site2.register(Comment, CommentsAdmin)
+
urlpatterns = patterns('',
(r'^admin/', include(admin_site.urls)),
+ (r'^admin2/', include(admin_site2.urls)),
)