Merged regressiontests and modeltests into the test root.

3 files changed, 80 insertions, 0 deletions

diff --git a/tests/admin_registration/__init__.py b/tests/admin_registration/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/admin_registration/__init__.py
diff --git a/tests/admin_registration/models.py b/tests/admin_registration/models.py
new file mode 100644
index 0000000000..c6f42fd1f4
--- /dev/null
+++ b/tests/admin_registration/models.py
@@ -0,0 +1,16 @@
+"""
+Tests for various ways of registering models with the admin site.
+"""
+
+from django.db import models
+
+
+class Person(models.Model):
+    name = models.CharField(max_length=200)
+
+class Location(models.Model):
+    class Meta:
+        abstract = True
+
+class Place(Location):
+    name = models.CharField(max_length=200)
diff --git a/tests/admin_registration/tests.py b/tests/admin_registration/tests.py
new file mode 100644
index 0000000000..1b2d291691
--- /dev/null
+++ b/tests/admin_registration/tests.py
@@ -0,0 +1,64 @@
+from __future__ import absolute_import
+
+from django.contrib import admin
+from django.core.exceptions import ImproperlyConfigured
+from django.test import TestCase
+
+from .models import Person, Place, Location
+
+
+class NameAdmin(admin.ModelAdmin):
+    list_display = ['name']
+    save_on_top = True
+
+class TestRegistration(TestCase):
+    def setUp(self):
+        self.site = admin.AdminSite()
+
+    def test_bare_registration(self):
+        self.site.register(Person)
+        self.assertTrue(
+            isinstance(self.site._registry[Person], admin.options.ModelAdmin)
+        )
+
+    def test_registration_with_model_admin(self):
+        self.site.register(Person, NameAdmin)
+        self.assertTrue(
+            isinstance(self.site._registry[Person], NameAdmin)
+        )
+
+    def test_prevent_double_registration(self):
+        self.site.register(Person)
+        self.assertRaises(admin.sites.AlreadyRegistered,
+                          self.site.register,
+                          Person)
+
+    def test_registration_with_star_star_options(self):
+        self.site.register(Person, search_fields=['name'])
+        self.assertEqual(self.site._registry[Person].search_fields, ['name'])
+
+    def test_star_star_overrides(self):
+        self.site.register(Person, NameAdmin,
+                           search_fields=["name"], list_display=['__str__'])
+        self.assertEqual(self.site._registry[Person].search_fields, ['name'])
+        self.assertEqual(self.site._registry[Person].list_display,
+                         ['__str__'])
+        self.assertTrue(self.site._registry[Person].save_on_top)
+
+    def test_iterable_registration(self):
+        self.site.register([Person, Place], search_fields=['name'])
+        self.assertTrue(
+            isinstance(self.site._registry[Person], admin.options.ModelAdmin)
+        )
+        self.assertEqual(self.site._registry[Person].search_fields, ['name'])
+        self.assertTrue(
+            isinstance(self.site._registry[Place], admin.options.ModelAdmin)
+        )
+        self.assertEqual(self.site._registry[Place].search_fields, ['name'])
+
+    def test_abstract_model(self):
+        """
+        Exception is raised when trying to register an abstract model.
+        Refs #12004.
+        """
+        self.assertRaises(ImproperlyConfigured, self.site.register, Location)