diff options
| author | Ola Sitarska <ola@sitarska.com> | 2015-09-08 20:46:26 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-08 19:13:43 -0400 |
| commit | f2f8972def26cea2b0e8dbe763e11436d194e3d4 (patch) | |
| tree | 7dc7a636008d1a968780540279d2cdad41f2f1bc /tests/admin_views/tests.py | |
| parent | 1bbca7961cee20c4ddd453a7d74d316e84f4bbb5 (diff) | |
Fixed #25135 -- Deprecated the contrib.admin allow_tags attribute.
Thanks Jaap Roes for the idea and initial patch.
Diffstat (limited to 'tests/admin_views/tests.py')
| -rw-r--r-- | tests/admin_views/tests.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 986add8479..942f033b6f 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -27,13 +27,14 @@ from django.forms.utils import ErrorList from django.template.loader import render_to_string from django.template.response import TemplateResponse from django.test import ( - SimpleTestCase, TestCase, modify_settings, override_settings, - skipUnlessDBFeature, + SimpleTestCase, TestCase, ignore_warnings, modify_settings, + override_settings, skipUnlessDBFeature, ) from django.test.utils import override_script_prefix, patch_logger from django.utils import formats, six, translation from django.utils._os import upath from django.utils.cache import get_max_age +from django.utils.deprecation import RemovedInDjango20Warning from django.utils.encoding import force_bytes, force_text, iri_to_uri from django.utils.html import escape from django.utils.http import urlencode @@ -4681,6 +4682,7 @@ class ReadonlyTest(TestCase): def setUp(self): self.client.login(username='super', password='secret') + @ignore_warnings(category=RemovedInDjango20Warning) # for allow_tags deprecation def test_readonly_get(self): response = self.client.get(reverse('admin:admin_views_post_add')) self.assertEqual(response.status_code, 200) @@ -4699,6 +4701,8 @@ class ReadonlyTest(TestCase): self.assertContains(response, "Multiline<br />test<br />string") self.assertContains(response, "<p>Multiline<br />html<br />content</p>", html=True) self.assertContains(response, "InlineMultiline<br />test<br />string") + # Remove only this last line when the deprecation completes. + self.assertContains(response, "<p>Multiline<br />html<br />content<br />with allow tags</p>", html=True) self.assertContains(response, formats.localize(datetime.date.today() - datetime.timedelta(days=7))) @@ -4768,6 +4772,7 @@ class ReadonlyTest(TestCase): response = self.client.get(reverse('admin:admin_views_topping_add')) self.assertEqual(response.status_code, 200) + @ignore_warnings(category=RemovedInDjango20Warning) # for allow_tags deprecation def test_readonly_field_overrides(self): """ Regression test for #22087 - ModelForm Meta overrides are ignored by @@ -5181,6 +5186,7 @@ class CSSTest(TestCase): def setUp(self): self.client.login(username='super', password='secret') + @ignore_warnings(category=RemovedInDjango20Warning) # for allow_tags deprecation def test_field_prefix_css_classes(self): """ Ensure that fields have a CSS class name with a 'field-' prefix. |
