diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2015-03-30 18:33:26 +0200 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-04-15 09:45:26 -0400 |
| commit | a429a502ea0e8297deef82442d481fc9a8f6cd9d (patch) | |
| tree | 695a0ef067a5681dea414eb52de0d38dfa37228e /tests/proxy_models | |
| parent | 97bb48d9ba864060d57a3137fb9c456b98ecc79b (diff) | |
Updated tests to stop leaking models in shared AdminSite.
This would break upcoming changes and AdminSite assumptions about
having an app_config for each application that has registered
models.
Diffstat (limited to 'tests/proxy_models')
| -rw-r--r-- | tests/proxy_models/admin.py | 5 | ||||
| -rw-r--r-- | tests/proxy_models/tests.py | 8 | ||||
| -rw-r--r-- | tests/proxy_models/urls.py | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/tests/proxy_models/admin.py b/tests/proxy_models/admin.py index 72556c34a5..ba67f7829f 100644 --- a/tests/proxy_models/admin.py +++ b/tests/proxy_models/admin.py @@ -2,5 +2,6 @@ from django.contrib import admin from .models import ProxyTrackerUser, TrackerUser -admin.site.register(TrackerUser) -admin.site.register(ProxyTrackerUser) +site = admin.AdminSite(name='admin_proxy') +site.register(TrackerUser) +site.register(ProxyTrackerUser) diff --git a/tests/proxy_models/tests.py b/tests/proxy_models/tests.py index 1aea80902e..98244327a3 100644 --- a/tests/proxy_models/tests.py +++ b/tests/proxy_models/tests.py @@ -433,17 +433,17 @@ class ProxyModelAdminTests(TestCase): proxy = ProxyTrackerUser.objects.get(name='Django Pony') user_str = 'Tracker user: <a href="%s">%s</a>' % ( - reverse('admin:proxy_models_trackeruser_change', args=(user.pk,)), user + reverse('admin_proxy:proxy_models_trackeruser_change', args=(user.pk,)), user ) proxy_str = 'Proxy tracker user: <a href="%s">%s</a>' % ( - reverse('admin:proxy_models_proxytrackeruser_change', args=(proxy.pk,)), proxy + reverse('admin_proxy:proxy_models_proxytrackeruser_change', args=(proxy.pk,)), proxy ) self.client.login(username='super', password='secret') - response = self.client.get(reverse('admin:proxy_models_trackeruser_delete', args=(user.pk,))) + response = self.client.get(reverse('admin_proxy:proxy_models_trackeruser_delete', args=(user.pk,))) delete_str = response.context['deleted_objects'][0] self.assertEqual(delete_str, user_str) - response = self.client.get(reverse('admin:proxy_models_proxytrackeruser_delete', args=(proxy.pk,))) + response = self.client.get(reverse('admin_proxy:proxy_models_proxytrackeruser_delete', args=(proxy.pk,))) delete_str = response.context['deleted_objects'][0] self.assertEqual(delete_str, proxy_str) self.client.logout() diff --git a/tests/proxy_models/urls.py b/tests/proxy_models/urls.py index eb91d283d4..854ac78040 100644 --- a/tests/proxy_models/urls.py +++ b/tests/proxy_models/urls.py @@ -1,6 +1,7 @@ from django.conf.urls import include, url -from django.contrib import admin + +from .admin import site urlpatterns = [ - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', include(site.urls)), ] |