Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Migrated admin_registration doctests. Thanks to Sebastian Hillig.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 09cdfda2499e5e38b4cbf62c928a7586ee534bdf 1 parent 5ec1f0e
@freakboy3742 freakboy3742 authored
View
53 tests/regressiontests/admin_registration/models.py
@@ -3,62 +3,9 @@
"""
from django.db import models
-from django.contrib import admin
class Person(models.Model):
name = models.CharField(max_length=200)
class Place(models.Model):
name = models.CharField(max_length=200)
-
-__test__ = {'API_TESTS':"""
-
-
-# Bare registration
->>> site = admin.AdminSite()
->>> site.register(Person)
->>> site._registry[Person]
-<django.contrib.admin.options.ModelAdmin object at ...>
-
-# Registration with a ModelAdmin
->>> site = admin.AdminSite()
->>> class NameAdmin(admin.ModelAdmin):
-... list_display = ['name']
-... save_on_top = True
-
->>> site.register(Person, NameAdmin)
->>> site._registry[Person]
-<regressiontests.admin_registration.models.NameAdmin object at ...>
-
-# You can't register the same model twice
->>> site.register(Person)
-Traceback (most recent call last):
- ...
-AlreadyRegistered: The model Person is already registered
-
-# Registration using **options
->>> site = admin.AdminSite()
->>> site.register(Person, search_fields=['name'])
->>> site._registry[Person].search_fields
-['name']
-
-# With both admin_class and **options the **options override the fields in
-# the admin class.
->>> site = admin.AdminSite()
->>> site.register(Person, NameAdmin, search_fields=["name"], list_display=['__str__'])
->>> site._registry[Person].search_fields
-['name']
->>> site._registry[Person].list_display
-['action_checkbox', '__str__']
->>> site._registry[Person].save_on_top
-True
-
-# You can also register iterables instead of single classes -- a nice shortcut
->>> site = admin.AdminSite()
->>> site.register([Person, Place], search_fields=['name'])
->>> site._registry[Person]
-<django.contrib.admin.sites.PersonAdmin object at ...>
->>> site._registry[Place]
-<django.contrib.admin.sites.PlaceAdmin object at ...>
-
-"""}
View
54 tests/regressiontests/admin_registration/tests.py
@@ -0,0 +1,54 @@
+from django.test import TestCase
+
+from django.contrib import admin
+
+from models import Person, Place
+
+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,
+ ['action_checkbox', '__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'])
Please sign in to comment.
Something went wrong with that request. Please try again.