mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 02:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Updated tests to stop leaking models in shared AdminSite.

Browse source 
This would break upcoming changes and AdminSite assumptions about
having an app_config for each application that has registered
models.
This commit is contained in:
Riccardo Magliocchetti 2015-03-30 18:33:26 +02:00 • committed by Tim Graham
parent 97bb48d9ba
commit a429a502ea
11 changed files with 50 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/gis_tests/geoadmin/tests.py
View file

@ -8,7 +8,7 @@ if HAS_GEOS:
from django.contrib.gis.geos import Point
from .admin import UnmodifiableAdmin
from .models import City
from .models import site, City
@skipUnlessDBFeature("gis_enabled")
@ -16,14 +16,14 @@ if HAS_GEOS:
class GeoAdminTest(TestCase):
def test_ensure_geographic_media(self):
geoadmin = admin.site._registry[City]
geoadmin = site._registry[City]
admin_js = geoadmin.media.render_js()
self.assertTrue(any(geoadmin.openlayers_url in js for js in admin_js))
def test_olmap_OSM_rendering(self):
delete_all_btn = """<a href="javascript:geodjango_point.clearFeatures()">Delete all Features</a>"""
original_geoadmin = admin.site._registry[City]
original_geoadmin = site._registry[City]
params = original_geoadmin.get_map_widget(City._meta.get_field('point')).params
result = original_geoadmin.get_map_widget(City._meta.get_field('point'))(
).render('point', Point(-79.460734, 40.18476), params)
@ -33,21 +33,21 @@ class GeoAdminTest(TestCase):
self.assertIn(delete_all_btn, result)
admin.site.unregister(City)
admin.site.register(City, UnmodifiableAdmin)
site.unregister(City)
site.register(City, UnmodifiableAdmin)
try:
geoadmin = admin.site._registry[City]
geoadmin = site._registry[City]
params = geoadmin.get_map_widget(City._meta.get_field('point')).params
result = geoadmin.get_map_widget(City._meta.get_field('point'))(
).render('point', Point(-79.460734, 40.18476), params)
self.assertNotIn(delete_all_btn, result)
finally:
admin.site.unregister(City)
admin.site.register(City, original_geoadmin.__class__)
site.unregister(City)
site.register(City, original_geoadmin.__class__)
def test_olmap_WMS_rendering(self):
geoadmin = admin.GeoModelAdmin(City, admin.site)
geoadmin = admin.GeoModelAdmin(City, site)
result = geoadmin.get_map_widget(City._meta.get_field('point'))(
).render('point', Point(-79.460734, 40.18476))
self.assertIn(
@ -59,7 +59,7 @@ class GeoAdminTest(TestCase):
"""
Check that changes are accurately noticed by OpenLayersWidget.
"""
geoadmin = admin.site._registry[City]
geoadmin = site._registry[City]
form = geoadmin.get_changelist_form(None)()
has_changed = form.fields['point'].has_changed