- Testcase

diff --git a/jinja2/testsuite/regression.py b/jinja2/testsuite/regression.py
index 4db90769d6d6f274e905e00cbf44204b22bd4fb7..cbe8ad19ecc771ff46bc93a9cdeaab90d95feaf6 100644 (file)
--- a/jinja2/testsuite/regression.py
+++ b/jinja2/testsuite/regression.py
@@ -246,7 +246,19 @@ class BugTestCase(JinjaTestCase):
             assert e.name == 'foo/bar.html'
         else:
             assert False, 'expected error here'
-
+    
+    def test_contextfunction_callable_classes(self):
+        from jinja2.utils import contextfunction
+        class CallableClass(object):
+            @contextfunction
+            def __call__(self, ctx):
+                return ctx.resolve('hello')
+        
+        tpl = Template("""{{ callableclass() }}""")
+        output = tpl.render(callableclass = CallableClass(), hello = 'TEST')
+        expected = 'TEST'
+        
+        self.assert_equal(output, expected)
 
 def suite():
     suite = unittest.TestSuite()