summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-08-17 09:01:59 -0400
committerTim Graham <timograham@gmail.com>2015-09-23 19:31:09 -0400
commit3af9b70028487be81c4f6ca65ca0d1f2be337e4f (patch)
tree09424e030aad263740bd264f421b34a154ecab7c /tests
parent57039f9661d2fc06618bba1ed60d005212ee26e3 (diff)
Refs #22789 -- Removed contrib.webdesign per deprecation timeline.
Diffstat (limited to 'tests')
-rw-r--r--tests/apps/tests.py4
-rwxr-xr-xtests/runtests.py5
-rw-r--r--tests/webdesign_tests/__init__.py0
-rw-r--r--tests/webdesign_tests/tests.py14
4 files changed, 2 insertions, 21 deletions
diff --git a/tests/apps/tests.py b/tests/apps/tests.py
index 9e34773a77..c226bf5010 100644
--- a/tests/apps/tests.py
+++ b/tests/apps/tests.py
@@ -118,7 +118,7 @@ class AppsTests(SimpleTestCase):
self.assertEqual(app_config.name, 'django.contrib.staticfiles')
with self.assertRaises(LookupError):
- apps.get_app_config('webdesign')
+ apps.get_app_config('admindocs')
msg = "No installed app with label 'django.contrib.auth'. Did you mean 'myauth'"
with self.assertRaisesMessage(LookupError, msg):
@@ -132,7 +132,7 @@ class AppsTests(SimpleTestCase):
self.assertTrue(apps.is_installed('django.contrib.admin'))
self.assertTrue(apps.is_installed('django.contrib.auth'))
self.assertTrue(apps.is_installed('django.contrib.staticfiles'))
- self.assertFalse(apps.is_installed('django.contrib.webdesign'))
+ self.assertFalse(apps.is_installed('django.contrib.admindocs'))
@override_settings(INSTALLED_APPS=SOME_INSTALLED_APPS)
def test_get_model(self):
diff --git a/tests/runtests.py b/tests/runtests.py
index 4c31090615..0726fbb51d 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -171,11 +171,6 @@ def setup(verbosity, test_labels, parallel):
warnings.filterwarnings(
'ignore',
- 'django.contrib.webdesign will be removed in Django 1.10.',
- RemovedInDjango110Warning
- )
- warnings.filterwarnings(
- 'ignore',
'The GeoManager class is deprecated.',
RemovedInDjango20Warning
)
diff --git a/tests/webdesign_tests/__init__.py b/tests/webdesign_tests/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/tests/webdesign_tests/__init__.py
+++ /dev/null
diff --git a/tests/webdesign_tests/tests.py b/tests/webdesign_tests/tests.py
deleted file mode 100644
index 0f8508c1a8..0000000000
--- a/tests/webdesign_tests/tests.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.template import Context, Template
-from django.test import SimpleTestCase, modify_settings
-
-
-@modify_settings(INSTALLED_APPS={'append': 'django.contrib.webdesign'})
-class WebdesignTest(SimpleTestCase):
-
- def test_lorem_tag(self):
- t = Template("{% load webdesign %}{% lorem 3 w %}")
- self.assertEqual(t.render(Context({})),
- 'lorem ipsum dolor')