Fixed #24847 -- Prevented items set on a RequestContext from being lost.

Backport of 300e8baf9429dbf1c5dff478558d793638dc2f54 from master

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/template_tests/test_context.py b/tests/template_tests/test_context.py
index 8331904f64..8b340b402d 100644
--- a/tests/template_tests/test_context.py
+++ b/tests/template_tests/test_context.py
@@ -134,8 +134,8 @@ class RequestContextTests(SimpleTestCase):
         request = RequestFactory().get('/')
         ctx = RequestContext(request, {})
         # The stack should now contain 3 items:
-        # [builtins, supplied context, context processor]
-        self.assertEqual(len(ctx.dicts), 3)
+        # [builtins, supplied context, context processor, empty dict]
+        self.assertEqual(len(ctx.dicts), 4)
 
     def test_context_comparable(self):
         # Create an engine without any context processors.
@@ -149,3 +149,10 @@ class RequestContextTests(SimpleTestCase):
             RequestContext(request, dict_=test_data),
             RequestContext(request, dict_=test_data),
         )
+
+    def test_modify_context_and_render(self):
+        template = Template('{{ foo }}')
+        request = RequestFactory().get('/')
+        context = RequestContext(request, {})
+        context['foo'] = 'foo'
+        self.assertEqual(template.render(context), 'foo')