Permalink
Browse files

Fixed #13092 -- Added support for the "in" operator when dealing with…

… context lists. Thanks to clelland for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13510 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent c4b6edf commit 6eb7cd1af49950f9128b7867a8ce886223b47d4f @freakboy3742 freakboy3742 committed Aug 6, 2010
Showing with 8 additions and 0 deletions.
  1. +6 −0 django/test/utils.py
  2. +2 −0 tests/regressiontests/test_client_regress/models.py
@@ -19,6 +19,12 @@ def __getitem__(self, key):
else:
return super(ContextList, self).__getitem__(key)
+ def __contains__(self, key):
+ try:
+ value = self[key]
+ except KeyError:
+ return False
+ return True
def instrumented_test_render(self, context):
"""
@@ -619,6 +619,7 @@ def test_single_context(self):
"Context variables can be retrieved from a single context"
response = self.client.get("/test_client_regress/request_data/", data={'foo':'whiz'})
self.assertEqual(response.context.__class__, Context)
+ self.assertTrue('get-foo' in response.context)
self.assertEqual(response.context['get-foo'], 'whiz')
self.assertEqual(response.context['request-foo'], 'whiz')
self.assertEqual(response.context['data'], 'sausage')
@@ -634,6 +635,7 @@ def test_inherited_context(self):
response = self.client.get("/test_client_regress/request_data_extended/", data={'foo':'whiz'})
self.assertEqual(response.context.__class__, ContextList)
self.assertEqual(len(response.context), 2)
+ self.assertTrue('get-foo' in response.context)
self.assertEqual(response.context['get-foo'], 'whiz')
self.assertEqual(response.context['request-foo'], 'whiz')
self.assertEqual(response.context['data'], 'bacon')

0 comments on commit 6eb7cd1

Please sign in to comment.