From 645eb2b26b01520d7e98cb3c2f671e254571a090 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Sat, 15 Jan 2011 23:38:00 +0000 Subject: 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 --- tests/regressiontests/staticfiles_tests/tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') 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 -- cgit v1.3