Fixes #1338, Refs #1400, #2237 -- Modified variable resolution to allow template 'if' statements to work if TEMPLATE_STRING_IF_INVALID is set. Modified unit tests to force the use of this variable, so that returning '' isn't confused with an actual failure.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3268 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 10 insertions, 6 deletions

diff --git a/tests/othertests/templates.py b/tests/othertests/templates.py
index c0333c90a6..d3b09c5310 100644
--- a/tests/othertests/templates.py
+++ b/tests/othertests/templates.py
@@ -78,7 +78,7 @@ TEMPLATE_TESTS = {
     'basic-syntax03': ("{{ first }} --- {{ second }}", {"first" : 1, "second" : 2}, "1 --- 2"),
 
     # Fail silently when a variable is not found in the current context
-    'basic-syntax04': ("as{{ missing }}df", {}, "asdf"),
+    'basic-syntax04': ("as{{ missing }}df", {}, "asINVALIDdf"),
 
     # A variable may not contain more than one word
     'basic-syntax06': ("{{ multi word variable }}", {}, template.TemplateSyntaxError),
@@ -94,7 +94,7 @@ TEMPLATE_TESTS = {
     'basic-syntax10': ("{{ var.otherclass.method }}", {"var": SomeClass()}, "OtherClass.method"),
 
     # Fail silently when a variable's attribute isn't found
-    'basic-syntax11': ("{{ var.blech }}", {"var": SomeClass()}, ""),
+    'basic-syntax11': ("{{ var.blech }}", {"var": SomeClass()}, "INVALID"),
 
     # Raise TemplateSyntaxError when trying to access a variable beginning with an underscore
     'basic-syntax12': ("{{ var.__dict__ }}", {"var": SomeClass()}, template.TemplateSyntaxError),
@@ -110,10 +110,10 @@ TEMPLATE_TESTS = {
     'basic-syntax18': ("{{ foo.bar }}", {"foo" : {"bar" : "baz"}}, "baz"),
 
     # Fail silently when a variable's dictionary key isn't found
-    'basic-syntax19': ("{{ foo.spam }}", {"foo" : {"bar" : "baz"}}, ""),
+    'basic-syntax19': ("{{ foo.spam }}", {"foo" : {"bar" : "baz"}}, "INVALID"),
 
     # Fail silently when accessing a non-simple method
-    'basic-syntax20': ("{{ var.method2 }}", {"var": SomeClass()}, ""),
+    'basic-syntax20': ("{{ var.method2 }}", {"var": SomeClass()}, "INVALID"),
 
     # Basic filter usage
     'basic-syntax21': ("{{ var|upper }}", {"var": "Django is the greatest!"}, "DJANGO IS THE GREATEST!"),
@@ -152,7 +152,7 @@ TEMPLATE_TESTS = {
     'basic-syntax32': (r'{{ var|yesno:"yup,nup,mup" }} {{ var|yesno }}', {"var": True}, 'yup yes'),
 
     # Fail silently for methods that raise an exception with a "silent_variable_failure" attribute
-    'basic-syntax33': (r'1{{ var.method3 }}2', {"var": SomeClass()}, "12"),
+    'basic-syntax33': (r'1{{ var.method3 }}2', {"var": SomeClass()}, "1INVALID2"),
 
     # In methods that raise an exception without a "silent_variable_attribute" set to True,
     # the exception propogates
@@ -495,7 +495,7 @@ TEMPLATE_TESTS = {
                   '{{ item.foo }}' + \
                   '{% endfor %},' + \
                   '{% endfor %}',
-                  {}, ''),
+                  {}, 'INVALID:INVALIDINVALIDINVALIDINVALIDINVALIDINVALIDINVALID,'),
 
     ### TEMPLATETAG TAG #######################################################
     'templatetag01': ('{% templatetag openblock %}', {}, '{%'),
@@ -579,6 +579,9 @@ def run_tests(verbosity=0, standalone=False):
 
     # Turn TEMPLATE_DEBUG off, because tests assume that.
     old_td, settings.TEMPLATE_DEBUG = settings.TEMPLATE_DEBUG, False
+    # Set TEMPLATE_STRING_IF_INVALID to a known string 
+    old_invalid, settings.TEMPLATE_STRING_IF_INVALID = settings.TEMPLATE_STRING_IF_INVALID, 'INVALID'
+    
     for name, vals in tests:
         install()
         if 'LANGUAGE_CODE' in vals[1]:
@@ -609,6 +612,7 @@ def run_tests(verbosity=0, standalone=False):
     loader.template_source_loaders = old_template_loaders
     deactivate()
     settings.TEMPLATE_DEBUG = old_td
+    settings.TEMPLATE_STRING_IF_INVALID = old_invalid
 
     if failed_tests and not standalone:
         msg = "Template tests %s failed." % failed_tests