diff options
author | Anubhav Joshi <anubhav9042@gmail.com> | 2014-04-05 11:34:46 +0530 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2014-04-06 17:33:43 -0400 |
commit | cd914e31c9a889f18c50c15b4f6ee4959624001f (patch) | |
tree | 291036036473baaf6de621f66a6198ed4bc12451 /django/contrib | |
parent | d2f4553d705951ca8043d687f9493c559f494a0c (diff) | |
download | django-cd914e31c9a889f18c50c15b4f6ee4959624001f.tar.gz |
Fixed #21977 -- Deprecated SimpleTestCase.urls
Diffstat (limited to 'django/contrib')
20 files changed, 40 insertions, 38 deletions
diff --git a/django/contrib/auth/tests/test_context_processors.py b/django/contrib/auth/tests/test_context_processors.py index 48c5b77f20..2e4cd00802 100644 --- a/django/contrib/auth/tests/test_context_processors.py +++ b/django/contrib/auth/tests/test_context_processors.py @@ -66,6 +66,7 @@ class PermWrapperTests(TestCase): TEMPLATE_DIRS=( os.path.join(os.path.dirname(upath(__file__)), 'templates'), ), + ROOT_URLCONF='django.contrib.auth.tests.urls', USE_TZ=False, # required for loading the fixture PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), ) @@ -73,7 +74,6 @@ class AuthContextProcessorTests(TestCase): """ Tests for the ``django.contrib.auth.context_processors.auth`` processor """ - urls = 'django.contrib.auth.tests.urls' fixtures = ['context-processors-users.xml'] @override_settings( diff --git a/django/contrib/auth/tests/test_decorators.py b/django/contrib/auth/tests/test_decorators.py index 22ad933644..7ee3499bbf 100644 --- a/django/contrib/auth/tests/test_decorators.py +++ b/django/contrib/auth/tests/test_decorators.py @@ -5,16 +5,16 @@ from django.contrib.auth.tests.test_views import AuthViewsTestCase from django.contrib.auth.tests.utils import skipIfCustomUser from django.core.exceptions import PermissionDenied from django.http import HttpResponse -from django.test import TestCase +from django.test import TestCase, override_settings from django.test.client import RequestFactory @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.auth.tests.urls') class LoginRequiredTestCase(AuthViewsTestCase): """ Tests the login_required decorators """ - urls = 'django.contrib.auth.tests.urls' def testCallable(self): """ diff --git a/django/contrib/auth/tests/test_remote_user.py b/django/contrib/auth/tests/test_remote_user.py index 5b743ac8c1..2ccfd6e6fa 100644 --- a/django/contrib/auth/tests/test_remote_user.py +++ b/django/contrib/auth/tests/test_remote_user.py @@ -6,14 +6,14 @@ from django.contrib.auth.backends import RemoteUserBackend from django.contrib.auth.middleware import RemoteUserMiddleware from django.contrib.auth.models import User from django.contrib.auth.tests.utils import skipIfCustomUser -from django.test import TestCase +from django.test import TestCase, override_settings from django.utils import timezone @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.auth.tests.urls') class RemoteUserTest(TestCase): - urls = 'django.contrib.auth.tests.urls' middleware = 'django.contrib.auth.middleware.RemoteUserMiddleware' backend = 'django.contrib.auth.backends.RemoteUserBackend' header = 'REMOTE_USER' diff --git a/django/contrib/auth/tests/test_signals.py b/django/contrib/auth/tests/test_signals.py index 81266807c9..61513b4177 100644 --- a/django/contrib/auth/tests/test_signals.py +++ b/django/contrib/auth/tests/test_signals.py @@ -7,9 +7,10 @@ from django.test import override_settings @skipIfCustomUser -@override_settings(USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',)) +@override_settings(USE_TZ=False, + PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='django.contrib.auth.tests.urls') class SignalTestCase(TestCase): - urls = 'django.contrib.auth.tests.urls' fixtures = ['authtestdata.json'] def listener_login(self, user, **kwargs): diff --git a/django/contrib/auth/tests/test_templates.py b/django/contrib/auth/tests/test_templates.py index 3b4332d642..c5d4cea896 100644 --- a/django/contrib/auth/tests/test_templates.py +++ b/django/contrib/auth/tests/test_templates.py @@ -15,9 +15,9 @@ from django.utils.http import urlsafe_base64_encode @skipIfCustomUser @override_settings( PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='django.contrib.auth.tests.urls', ) class AuthTemplateTests(TestCase): - urls = 'django.contrib.auth.tests.urls' def test_titles(self): rf = RequestFactory() diff --git a/django/contrib/auth/tests/test_views.py b/django/contrib/auth/tests/test_views.py index 01e3825bf4..fa8b38f4c5 100644 --- a/django/contrib/auth/tests/test_views.py +++ b/django/contrib/auth/tests/test_views.py @@ -41,13 +41,13 @@ from django.contrib.auth.views import login as login_view ), USE_TZ=False, PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='django.contrib.auth.tests.urls', ) class AuthViewsTestCase(TestCase): """ Helper base class for all the follow test cases. """ fixtures = ['authtestdata.json'] - urls = 'django.contrib.auth.tests.urls' def login(self, username='testclient', password='password'): response = self.client.post('/login/', { @@ -86,8 +86,8 @@ class AuthViewsTestCase(TestCase): @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.auth.urls') class AuthViewNamedURLTests(AuthViewsTestCase): - urls = 'django.contrib.auth.urls' def test_named_urls(self): "Named URLs should be reversible" @@ -786,9 +786,9 @@ class LogoutTest(AuthViewsTestCase): 'django.contrib.auth.middleware.SessionAuthenticationMiddleware' ], PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), + ROOT_URLCONF='django.contrib.auth.tests.urls_admin', ) class ChangelistTests(AuthViewsTestCase): - urls = 'django.contrib.auth.tests.urls_admin' def setUp(self): # Make me a superuser before logging in. diff --git a/django/contrib/flatpages/tests/test_csrf.py b/django/contrib/flatpages/tests/test_csrf.py index 9ec12a7695..2ade56aa57 100644 --- a/django/contrib/flatpages/tests/test_csrf.py +++ b/django/contrib/flatpages/tests/test_csrf.py @@ -15,6 +15,7 @@ from django.test import override_settings 'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', ), + ROOT_URLCONF='django.contrib.flatpages.tests.urls', CSRF_FAILURE_VIEW='django.views.csrf.csrf_failure', TEMPLATE_DIRS=( os.path.join(os.path.dirname(__file__), 'templates'), @@ -23,7 +24,6 @@ from django.test import override_settings ) class FlatpageCSRFTests(TestCase): fixtures = ['sample_flatpages', 'example_site'] - urls = 'django.contrib.flatpages.tests.urls' def setUp(self): self.client = Client(enforce_csrf_checks=True) diff --git a/django/contrib/flatpages/tests/test_middleware.py b/django/contrib/flatpages/tests/test_middleware.py index 6dd1f6b3b3..227e69eb49 100644 --- a/django/contrib/flatpages/tests/test_middleware.py +++ b/django/contrib/flatpages/tests/test_middleware.py @@ -16,6 +16,7 @@ from django.test import TestCase, override_settings 'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', ), + ROOT_URLCONF='django.contrib.flatpages.tests.urls', TEMPLATE_DIRS=( os.path.join(os.path.dirname(__file__), 'templates'), ), @@ -23,7 +24,6 @@ from django.test import TestCase, override_settings ) class FlatpageMiddlewareTests(TestCase): fixtures = ['sample_flatpages', 'example_site'] - urls = 'django.contrib.flatpages.tests.urls' def test_view_flatpage(self): "A flatpage can be served through a view, even when the middleware is in use" @@ -96,6 +96,7 @@ class FlatpageMiddlewareTests(TestCase): 'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', ), + ROOT_URLCONF='django.contrib.flatpages.tests.urls', TEMPLATE_DIRS=( os.path.join(os.path.dirname(__file__), 'templates'), ), @@ -103,7 +104,6 @@ class FlatpageMiddlewareTests(TestCase): ) class FlatpageMiddlewareAppendSlashTests(TestCase): fixtures = ['sample_flatpages', 'example_site'] - urls = 'django.contrib.flatpages.tests.urls' def test_redirect_view_flatpage(self): "A flatpage can be served through a view and should add a slash" diff --git a/django/contrib/flatpages/tests/test_templatetags.py b/django/contrib/flatpages/tests/test_templatetags.py index 25aacf1802..6008d525fa 100644 --- a/django/contrib/flatpages/tests/test_templatetags.py +++ b/django/contrib/flatpages/tests/test_templatetags.py @@ -14,6 +14,7 @@ from django.test import TestCase, override_settings 'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', ), + ROOT_URLCONF='django.contrib.flatpages.tests.urls', TEMPLATE_DIRS=( os.path.join(os.path.dirname(__file__), 'templates'), ), @@ -21,7 +22,6 @@ from django.test import TestCase, override_settings ) class FlatpageTemplateTagTests(TestCase): fixtures = ['sample_flatpages'] - urls = 'django.contrib.flatpages.tests.urls' def test_get_flatpages_tag(self): "The flatpage template tag retrives unregistered prefixed flatpages by default" diff --git a/django/contrib/flatpages/tests/test_views.py b/django/contrib/flatpages/tests/test_views.py index 6e8b5f4fab..f05e02c191 100644 --- a/django/contrib/flatpages/tests/test_views.py +++ b/django/contrib/flatpages/tests/test_views.py @@ -16,6 +16,7 @@ from django.test import TestCase, override_settings 'django.contrib.messages.middleware.MessageMiddleware', # no 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware' ), + ROOT_URLCONF='django.contrib.flatpages.tests.urls', TEMPLATE_DIRS=( os.path.join(os.path.dirname(__file__), 'templates'), ), @@ -23,7 +24,6 @@ from django.test import TestCase, override_settings ) class FlatpageViewTests(TestCase): fixtures = ['sample_flatpages', 'example_site'] - urls = 'django.contrib.flatpages.tests.urls' def test_view_flatpage(self): "A flatpage can be served through a view" @@ -84,6 +84,7 @@ class FlatpageViewTests(TestCase): 'django.contrib.messages.middleware.MessageMiddleware', # no 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware' ), + ROOT_URLCONF='django.contrib.flatpages.tests.urls', TEMPLATE_DIRS=( os.path.join(os.path.dirname(__file__), 'templates'), ), @@ -91,7 +92,6 @@ class FlatpageViewTests(TestCase): ) class FlatpageViewAppendSlashTests(TestCase): fixtures = ['sample_flatpages', 'example_site'] - urls = 'django.contrib.flatpages.tests.urls' def test_redirect_view_flatpage(self): "A flatpage can be served through a view and should add a slash" diff --git a/django/contrib/formtools/tests/tests.py b/django/contrib/formtools/tests/tests.py index 870f45abb0..5d3b2747a7 100644 --- a/django/contrib/formtools/tests/tests.py +++ b/django/contrib/formtools/tests/tests.py @@ -36,9 +36,9 @@ class TestFormPreview(preview.FormPreview): TEMPLATE_DIRS=( os.path.join(os.path.dirname(upath(__file__)), 'templates'), ), + ROOT_URLCONF='django.contrib.formtools.tests.urls', ) class PreviewTests(TestCase): - urls = 'django.contrib.formtools.tests.urls' def setUp(self): super(PreviewTests, self).setUp() diff --git a/django/contrib/formtools/tests/wizard/namedwizardtests/tests.py b/django/contrib/formtools/tests/wizard/namedwizardtests/tests.py index 6e22549007..2426e8312a 100644 --- a/django/contrib/formtools/tests/wizard/namedwizardtests/tests.py +++ b/django/contrib/formtools/tests/wizard/namedwizardtests/tests.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.core.urlresolvers import reverse from django.http import QueryDict -from django.test import TestCase +from django.test import TestCase, override_settings from django.contrib.auth.models import User from django.contrib.auth.tests.utils import skipIfCustomUser @@ -13,7 +13,6 @@ from django.contrib.formtools.tests.wizard.test_forms import get_request, Step1, class NamedWizardTests(object): - urls = 'django.contrib.formtools.tests.wizard.namedwizardtests.urls' def setUp(self): self.testuser, created = User.objects.get_or_create(username='testuser1') @@ -283,6 +282,7 @@ class NamedWizardTests(object): @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.formtools.tests.wizard.namedwizardtests.urls') class NamedSessionWizardTests(NamedWizardTests, TestCase): wizard_urlname = 'nwiz_session' wizard_step_1_data = { @@ -315,6 +315,7 @@ class NamedSessionWizardTests(NamedWizardTests, TestCase): @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.formtools.tests.wizard.namedwizardtests.urls') class NamedCookieWizardTests(NamedWizardTests, TestCase): wizard_urlname = 'nwiz_cookie' wizard_step_1_data = { @@ -347,7 +348,6 @@ class NamedCookieWizardTests(NamedWizardTests, TestCase): class NamedFormTests(object): - urls = 'django.contrib.formtools.tests.wizard.namedwizardtests.urls' def test_revalidation(self): request = get_request() @@ -376,12 +376,14 @@ class TestNamedUrlCookieWizardView(NamedUrlCookieWizardView): @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.formtools.tests.wizard.namedwizardtests.urls') class NamedSessionFormTests(NamedFormTests, TestCase): formwizard_class = TestNamedUrlSessionWizardView wizard_urlname = 'nwiz_session' @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.formtools.tests.wizard.namedwizardtests.urls') class NamedCookieFormTests(NamedFormTests, TestCase): formwizard_class = TestNamedUrlCookieWizardView wizard_urlname = 'nwiz_cookie' diff --git a/django/contrib/formtools/tests/wizard/wizardtests/tests.py b/django/contrib/formtools/tests/wizard/wizardtests/tests.py index 22c5b2bb9c..07036da4ae 100644 --- a/django/contrib/formtools/tests/wizard/wizardtests/tests.py +++ b/django/contrib/formtools/tests/wizard/wizardtests/tests.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import os from django import forms -from django.test import TestCase +from django.test import TestCase, override_settings from django.test.client import RequestFactory from django.conf import settings from django.contrib.auth.models import User @@ -24,7 +24,6 @@ PoemFormSet = forms.models.inlineformset_factory(Poet, Poem, fields="__all__") class WizardTests(object): - urls = 'django.contrib.formtools.tests.wizard.wizardtests.urls' def setUp(self): self.testuser, created = User.objects.get_or_create(username='testuser1') @@ -208,6 +207,7 @@ class WizardTests(object): @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.formtools.tests.wizard.wizardtests.urls') class SessionWizardTests(WizardTests, TestCase): wizard_url = '/wiz_session/' wizard_step_1_data = { @@ -240,6 +240,7 @@ class SessionWizardTests(WizardTests, TestCase): @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.formtools.tests.wizard.wizardtests.urls') class CookieWizardTests(WizardTests, TestCase): wizard_url = '/wiz_cookie/' wizard_step_1_data = { @@ -272,6 +273,7 @@ class CookieWizardTests(WizardTests, TestCase): @skipIfCustomUser +@override_settings(ROOT_URLCONF='django.contrib.formtools.tests.wizard.wizardtests.urls') class WizardTestKwargs(TestCase): wizard_url = '/wiz_other_template/' wizard_step_1_data = { @@ -301,7 +303,6 @@ class WizardTestKwargs(TestCase): 'cookie_contact_wizard-current_step': 'form4', } ) - urls = 'django.contrib.formtools.tests.wizard.wizardtests.urls' def setUp(self): self.testuser, created = User.objects.get_or_create(username='testuser1') diff --git a/django/contrib/gis/tests/geoadmin/tests.py b/django/contrib/gis/tests/geoadmin/tests.py index 5cd3c2eee2..faecea3164 100644 --- a/django/contrib/gis/tests/geoadmin/tests.py +++ b/django/contrib/gis/tests/geoadmin/tests.py @@ -4,7 +4,7 @@ from unittest import skipUnless from django.contrib.gis.geos import HAS_GEOS from django.contrib.gis.tests.utils import HAS_SPATIAL_DB -from django.test import TestCase +from django.test import TestCase, override_settings if HAS_GEOS and HAS_SPATIAL_DB: from django.contrib.gis import admin @@ -14,8 +14,8 @@ if HAS_GEOS and HAS_SPATIAL_DB: @skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.") +@override_settings(ROOT_URLCONF='django.contrib.gis.tests.geoadmin.urls') class GeoAdminTest(TestCase): - urls = 'django.contrib.gis.tests.geoadmin.urls' def test_ensure_geographic_media(self): geoadmin = admin.site._registry[City] diff --git a/django/contrib/gis/tests/geoapp/test_feeds.py b/django/contrib/gis/tests/geoapp/test_feeds.py index 96ba26cece..0f4eaaa5c4 100644 --- a/django/contrib/gis/tests/geoapp/test_feeds.py +++ b/django/contrib/gis/tests/geoapp/test_feeds.py @@ -7,18 +7,17 @@ from django.conf import settings from django.contrib.sites.models import Site from django.contrib.gis.geos import HAS_GEOS from django.contrib.gis.tests.utils import HAS_SPATIAL_DB -from django.test import TestCase, modify_settings +from django.test import TestCase, modify_settings, override_settings if HAS_GEOS: from .models import City @modify_settings(INSTALLED_APPS={'append': 'django.contrib.sites'}) +@override_settings(ROOT_URLCONF='django.contrib.gis.tests.geoapp.urls') @skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.") class GeoFeedTest(TestCase): - urls = 'django.contrib.gis.tests.geoapp.urls' - def setUp(self): Site(id=settings.SITE_ID, domain="example.com", name="example.com").save() diff --git a/django/contrib/gis/tests/geoapp/test_sitemaps.py b/django/contrib/gis/tests/geoapp/test_sitemaps.py index f4dc5e80d2..e4b1652f1a 100644 --- a/django/contrib/gis/tests/geoapp/test_sitemaps.py +++ b/django/contrib/gis/tests/geoapp/test_sitemaps.py @@ -9,18 +9,17 @@ from django.conf import settings from django.contrib.gis.geos import HAS_GEOS from django.contrib.gis.tests.utils import HAS_SPATIAL_DB from django.contrib.sites.models import Site -from django.test import TestCase, modify_settings +from django.test import TestCase, modify_settings, override_settings if HAS_GEOS: from .models import City, Country @modify_settings(INSTALLED_APPS={'append': ['django.contrib.sites', 'django.contrib.sitemaps']}) +@override_settings(ROOT_URLCONF='django.contrib.gis.tests.geoapp.urls') @skipUnless(HAS_GEOS and HAS_SPATIAL_DB, "Geos and spatial db are required.") class GeoSitemapTest(TestCase): - urls = 'django.contrib.gis.tests.geoapp.urls' - def setUp(self): super(GeoSitemapTest, self).setUp() Site(id=settings.SITE_ID, domain="example.com", name="example.com").save() diff --git a/django/contrib/messages/tests/base.py b/django/contrib/messages/tests/base.py index b0c35b9d06..9d663bbf7a 100644 --- a/django/contrib/messages/tests/base.py +++ b/django/contrib/messages/tests/base.py @@ -48,7 +48,6 @@ class override_settings_tags(override_settings): class BaseTests(object): storage_class = default_storage - urls = 'django.contrib.messages.tests.urls' levels = { 'debug': constants.DEBUG, 'info': constants.INFO, @@ -61,6 +60,7 @@ class BaseTests(object): self.settings_override = override_settings_tags( TEMPLATE_DIRS=(), TEMPLATE_CONTEXT_PROCESSORS=global_settings.TEMPLATE_CONTEXT_PROCESSORS, + ROOT_URLCONF='django.contrib.messages.tests.urls', MESSAGE_TAGS='', MESSAGE_STORAGE='%s.%s' % (self.storage_class.__module__, self.storage_class.__name__), diff --git a/django/contrib/messages/tests/test_mixins.py b/django/contrib/messages/tests/test_mixins.py index 954bc8ec6a..35bb86d057 100644 --- a/django/contrib/messages/tests/test_mixins.py +++ b/django/contrib/messages/tests/test_mixins.py @@ -1,10 +1,10 @@ -from django.test import TestCase +from django.test import TestCase, override_settings from django.contrib.messages.tests.urls import ContactFormViewWithMsg from django.core.urlresolvers import reverse +@override_settings(ROOT_URLCONF='django.contrib.messages.tests.urls') class SuccessMessageMixinTests(TestCase): - urls = 'django.contrib.messages.tests.urls' def test_set_messages_success(self): author = {'name': 'John Doe', diff --git a/django/contrib/sitemaps/tests/base.py b/django/contrib/sitemaps/tests/base.py index cc92c023ce..2d0a7bff20 100644 --- a/django/contrib/sitemaps/tests/base.py +++ b/django/contrib/sitemaps/tests/base.py @@ -1,7 +1,7 @@ from django.apps import apps from django.core.cache import cache from django.db import models -from django.test import TestCase +from django.test import TestCase, override_settings class TestModel(models.Model): @@ -17,11 +17,11 @@ class TestModel(models.Model): return '/testmodel/%s/' % self.id +@override_settings(ROOT_URLCONF='django.contrib.sitemaps.tests.urls.http') class SitemapTestsBase(TestCase): protocol = 'http' sites_installed = apps.is_installed('django.contrib.sites') domain = 'example.com' if sites_installed else 'testserver' - urls = 'django.contrib.sitemaps.tests.urls.http' def setUp(self): self.base_url = '%s://%s' % (self.protocol, self.domain) diff --git a/django/contrib/sitemaps/tests/test_https.py b/django/contrib/sitemaps/tests/test_https.py index 58ff68931e..1ded723d74 100644 --- a/django/contrib/sitemaps/tests/test_https.py +++ b/django/contrib/sitemaps/tests/test_https.py @@ -7,9 +7,9 @@ from django.test import override_settings from .base import SitemapTestsBase +@override_settings(ROOT_URLCONF='django.contrib.sitemaps.tests.urls.https') class HTTPSSitemapTests(SitemapTestsBase): protocol = 'https' - urls = 'django.contrib.sitemaps.tests.urls.https' def test_secure_sitemap_index(self): "A secure sitemap index can be rendered" |