From 2b53c8377dcb7270d95db0b3ea8b2cb28550c5a8 Mon Sep 17 00:00:00 2001
From: Anton Samarchyan <anton.samarchyan@savoirfairelinux.com>
Date: Fri, 2 Jun 2017 18:44:34 -0400
Subject: Improved test coverage of contrib/admin/checks.py.

---
 tests/modeladmin/test_checks.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'tests/modeladmin')

diff --git a/tests/modeladmin/test_checks.py b/tests/modeladmin/test_checks.py
index decddee591..acca6b18a2 100644
--- a/tests/modeladmin/test_checks.py
+++ b/tests/modeladmin/test_checks.py
@@ -366,6 +366,17 @@ class RadioFieldsCheckTests(CheckTestCase):
 
 class PrepopulatedFieldsCheckTests(CheckTestCase):
 
+    def test_not_list_or_tuple(self):
+        class TestModelAdmin(ModelAdmin):
+            prepopulated_fields = {'slug': 'test'}
+
+        self.assertIsInvalid(
+            TestModelAdmin, ValidationTestModel,
+            'The value of \'prepopulated_fields["slug"]\' must be a list '
+            'or tuple.',
+            'admin.E029'
+        )
+
     def test_not_dictionary(self):
         class TestModelAdmin(ModelAdmin):
             prepopulated_fields = ()
@@ -1130,3 +1141,15 @@ class ListDisplayEditableTests(CheckTestCase):
             "'list_display_links' is set.",
             id='admin.E124',
         )
+
+    def test_both_list_editable_and_list_display_links(self):
+        class ProductAdmin(ModelAdmin):
+            list_editable = ('name',)
+            list_display = ('name',)
+            list_display_links = ('name',)
+        self.assertIsInvalid(
+            ProductAdmin, ValidationTestModel,
+            "The value of 'name' cannot be in both 'list_editable' and "
+            "'list_display_links'.",
+            id='admin.E123',
+        )
-- 
cgit v1.3