mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location.

Browse Source 
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.

Thanks to Jacob for the review and general help.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel
2011-06-30 09:06:19 +00:00
parent 89e0e8b6bc
commit 38a2444277
118 changed files with 485 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/regressiontests/servers/tests.py
View File

@@ -1,32 +1,33 @@
"""
Tests for django.core.servers.
"""
import os
from urlparse import urljoin
import django
from django.conf import settings
from django.test import TestCase
from django.core.handlers.wsgi import WSGIHandler
from django.core.servers.basehttp import AdminMediaHandler
from django.conf import settings
class AdminMediaHandlerTests(TestCase):
def setUp(self):
self.admin_media_url = urljoin(settings.STATIC_URL, 'admin/')
self.admin_media_file_path = os.path.abspath(
os.path.join(django.__path__[0], 'contrib', 'admin', 'media')
os.path.join(django.__path__[0], 'contrib', 'admin', 'static', 'admin')
)
self.handler = AdminMediaHandler(WSGIHandler())
def test_media_urls(self):
"""
Tests that URLs that look like absolute file paths after the
settings.ADMIN_MEDIA_PREFIX don't turn into absolute file paths.
settings.STATIC_URL don't turn into absolute file paths.
"""
# Cases that should work on all platforms.
data = (
('%scss/base.css' % settings.ADMIN_MEDIA_PREFIX, ('css', 'base.css')),
('%scss/base.css' % self.admin_media_url, ('css', 'base.css')),
)
# Cases that should raise an exception.
bad_data = ()
@@ -35,19 +36,19 @@ class AdminMediaHandlerTests(TestCase):
if os.sep == '/':
data += (
# URL, tuple of relative path parts.
('%s\\css/base.css' % settings.ADMIN_MEDIA_PREFIX, ('\\css', 'base.css')),
('%s\\css/base.css' % self.admin_media_url, ('\\css', 'base.css')),
)
bad_data += (
'%s/css/base.css' % settings.ADMIN_MEDIA_PREFIX,
'%s///css/base.css' % settings.ADMIN_MEDIA_PREFIX,
'%s../css/base.css' % settings.ADMIN_MEDIA_PREFIX,
'%s/css/base.css' % self.admin_media_url,
'%s///css/base.css' % self.admin_media_url,
'%s../css/base.css' % self.admin_media_url,
)
elif os.sep == '\\':
bad_data += (
'%sC:\css/base.css' % settings.ADMIN_MEDIA_PREFIX,
'%s/\\css/base.css' % settings.ADMIN_MEDIA_PREFIX,
'%s\\css/base.css' % settings.ADMIN_MEDIA_PREFIX,
'%s\\\\css/base.css' % settings.ADMIN_MEDIA_PREFIX
'%sC:\css/base.css' % self.admin_media_url,
'%s/\\css/base.css' % self.admin_media_url,
'%s\\css/base.css' % self.admin_media_url,
'%s\\\\css/base.css' % self.admin_media_url
)
for url, path_tuple in data:
try: