From 417bb1b35d21c4bf02cb0acfd95f5b1ff6c49d70 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Thu, 9 Jun 2011 12:15:36 +0100
Subject: [PATCH] Added regression test for #185

---
 tests/django_tests.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/tests/django_tests.py b/tests/django_tests.py
index e5e26022..6be1ea25 100644
--- a/tests/django_tests.py
+++ b/tests/django_tests.py
@@ -5,6 +5,9 @@ import unittest
 
 from mongoengine import *
 
+from django.template import Context, Template
+from django.conf import settings
+settings.configure()
 
 class QuerySetTest(unittest.TestCase):
 
@@ -26,10 +29,6 @@ class QuerySetTest(unittest.TestCase):
         self.Person(name="B", age=40).save()
         self.Person(name="C", age=30).save()
 
-        from django.conf import settings
-        settings.configure()
-        from django.template import Context, Template
-
         t = Template("{% for o in ol %}{{ o.name }}-{{ o.age }}:{% endfor %}")
 
         d = {"ol": self.Person.objects.order_by('-name')}
@@ -41,4 +40,18 @@ class QuerySetTest(unittest.TestCase):
         d = {"ol": self.Person.objects.order_by('+age')}
         self.assertEqual(t.render(Context(d)), u'D-10:A-20:C-30:B-40:')
 
-        self.Person.drop_collection()
\ No newline at end of file
+        self.Person.drop_collection()
+
+    def test_q_object_filter_in_template(self):
+
+        self.Person.drop_collection()
+
+        self.Person(name="A", age=20).save()
+        self.Person(name="D", age=10).save()
+        self.Person(name="B", age=40).save()
+        self.Person(name="C", age=30).save()
+
+        t = Template("{% for o in ol %}{{ o.name }}-{{ o.age }}:{% endfor %}")
+
+        d = {"ol": self.Person.objects.filter(Q(age=10) | Q(name="C"))}
+        self.assertEqual(t.render(Context(d)), u'D-10:C-30:')
\ No newline at end of file