Fixed #25484 -- Made {% static %} render escaped URLs.

2 files changed, 3 insertions, 1 deletions

diff --git a/tests/staticfiles_tests/cases.py b/tests/staticfiles_tests/cases.py
index abc4f1e81b..ea16101eb6 100644
--- a/tests/staticfiles_tests/cases.py
+++ b/tests/staticfiles_tests/cases.py
@@ -35,7 +35,7 @@ class BaseStaticFilesMixin(object):
     def render_template(self, template, **kwargs):
         if isinstance(template, six.string_types):
             template = Template(template)
-        return template.render(Context(kwargs)).strip()
+        return template.render(Context(**kwargs)).strip()
 
     def static_template_snippet(self, path, asvar=False):
         if asvar:
diff --git a/tests/staticfiles_tests/test_templatetags.py b/tests/staticfiles_tests/test_templatetags.py
index 7971ee1e51..050f19b179 100644
--- a/tests/staticfiles_tests/test_templatetags.py
+++ b/tests/staticfiles_tests/test_templatetags.py
@@ -8,3 +8,5 @@ class TestTemplateTag(StaticFilesTestCase):
     def test_template_tag(self):
         self.assertStaticRenders("does/not/exist.png", "/static/does/not/exist.png")
         self.assertStaticRenders("testfile.txt", "/static/testfile.txt")
+        self.assertStaticRenders("test.html?foo=1&bar=2", "/static/test.html?foo=1&bar=2", autoescape=False)
+        self.assertStaticRenders("test.html?foo=1&bar=2", "/static/test.html?foo=1&bar=2", autoescape=True)