summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-01-15 23:38:00 +0000
committerJannis Leidel <jannis@leidel.info>2011-01-15 23:38:00 +0000
commit645eb2b26b01520d7e98cb3c2f671e254571a090 (patch)
tree75f1a2003f7223efb29c485adef21e6158ab31be /tests
parent6c361ecb179cb0bfa76614e0292188c548801606 (diff)
Stopped staticfiles app from requiring a models module when looking for static files. Also removed a bit of code smell in the prefix handling by saving it in the source file storage.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/staticfiles_tests/tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/regressiontests/staticfiles_tests/tests.py b/tests/regressiontests/staticfiles_tests/tests.py
index 62286c7267..ea1f6d2954 100644
--- a/tests/regressiontests/staticfiles_tests/tests.py
+++ b/tests/regressiontests/staticfiles_tests/tests.py
@@ -34,9 +34,6 @@ class StaticFilesTestCase(TestCase):
self.old_debug = settings.DEBUG
self.old_installed_apps = settings.INSTALLED_APPS
- # We have to load these apps to test staticfiles.
- load_app('regressiontests.staticfiles_tests.apps.test')
- load_app('regressiontests.staticfiles_tests.apps.no_label')
site_media = os.path.join(TEST_ROOT, 'project', 'site_media')
settings.DEBUG = True
settings.MEDIA_ROOT = os.path.join(site_media, 'media')
@@ -53,8 +50,11 @@ class StaticFilesTestCase(TestCase):
'django.contrib.staticfiles.finders.DefaultStorageFinder',
)
settings.INSTALLED_APPS = [
+ 'django.contrib.admin',
'django.contrib.staticfiles',
'regressiontests.staticfiles_tests',
+ 'regressiontests.staticfiles_tests.apps.test',
+ 'regressiontests.staticfiles_tests.apps.no_label',
]
# Clear the cached default_storage out, this is because when it first