Refs #21221 -- Deprecated staticfiles and admin_static template tag libraries.

2 files changed, 30 insertions, 14 deletions

diff --git a/tests/admin_views/test_static_deprecation.py b/tests/admin_views/test_static_deprecation.py
new file mode 100644
index 0000000000..fb64df6f5f
--- /dev/null
+++ b/tests/admin_views/test_static_deprecation.py
@@ -0,0 +1,30 @@
+import warnings
+
+from django.contrib.admin.templatetags.admin_static import static
+from django.contrib.staticfiles.storage import staticfiles_storage
+from django.test import SimpleTestCase
+from django.utils.deprecation import RemovedInDjango30Warning
+
+
+class AdminStaticDeprecationTests(SimpleTestCase):
+    def test(self):
+        """
+        admin_static.static points to the collectstatic version
+        (as django.contrib.collectstatic is in INSTALLED_APPS).
+        """
+        msg = (
+            '{% load admin_static %} is deprecated in favor of '
+            '{% load static %}.'
+        )
+        old_url = staticfiles_storage.base_url
+        staticfiles_storage.base_url = '/test/'
+        try:
+            with warnings.catch_warnings(record=True) as recorded:
+                warnings.simplefilter('always')
+                url = static('path')
+            self.assertEqual(url, '/test/path')
+            self.assertEqual(len(recorded), 1)
+            self.assertIs(recorded[0].category, RemovedInDjango30Warning)
+            self.assertEqual(str(recorded[0].message), msg)
+        finally:
+            staticfiles_storage.base_url = old_url
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index a9746d9add..68094e0053 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -10,7 +10,6 @@ from django.contrib.admin import AdminSite, ModelAdmin
 from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.contrib.admin.models import ADDITION, DELETION, LogEntry
 from django.contrib.admin.options import TO_FIELD_VAR
-from django.contrib.admin.templatetags.admin_static import static
 from django.contrib.admin.templatetags.admin_urls import add_preserved_filters
 from django.contrib.admin.tests import AdminSeleniumTestCase
 from django.contrib.admin.utils import quote
@@ -18,7 +17,6 @@ from django.contrib.admin.views.main import IS_POPUP_VAR
 from django.contrib.auth import REDIRECT_FIELD_NAME, get_permission_codename
 from django.contrib.auth.models import Group, Permission, User
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.staticfiles.storage import staticfiles_storage
 from django.core import mail
 from django.core.checks import Error
 from django.core.files import temp as tempfile
@@ -200,18 +198,6 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
         response = self.client.get(add_url[:-1])
         self.assertRedirects(response, add_url, status_code=301)
 
-    def test_admin_static_template_tag(self):
-        """
-        admin_static.static points to the collectstatic version
-        (as django.contrib.collectstatic is in INSTALLED_APPS).
-        """
-        old_url = staticfiles_storage.base_url
-        staticfiles_storage.base_url = '/test/'
-        try:
-            self.assertEqual(static('path'), '/test/path')
-        finally:
-            staticfiles_storage.base_url = old_url
-
     def test_basic_add_GET(self):
         """
         A smoke test to ensure GET on the add_view works.