Merge branch 'master' of http://github.com/ericholscher/django-test-utils

Author: acdha

test_utils/testmaker/__init__.py

@@ -6,7 +6,8 @@
 from django.template import Context, Template
 from django.conf import settings
 
-TESTMAKER_TEMPLATE = """
+TESTMAKER_TEMPLATE = """\
+#coding: utf-8
 from django.test import TestCase
 from django.test import Client
 from django import template

test_utils/testmaker/processors/base.py

@@ -102,14 +102,14 @@ def _get_context_keys(self, context):
         keys = []
         for d in context.dicts:
             if isinstance(d, Context):
-                return self._get_context_keys(d)
+                keys += self._get_context_keys(d)
             keys += d.keys()
         return keys
 
     def _log_context(self, context):
         template = Template(self._get_template('context'))
+        keys = []
         if isinstance(context, list):
-            keys = []
             for c in context:
                 keys += self._get_context_keys(c)
         else:

test_utils/testmaker/processors/django_processor.py

@@ -8,7 +8,7 @@
 """        self.assertEqual(r.status_code, {{status_code}})"""
 
 CONTEXT_TEMPLATE = \
-"""        self.assertEqual(unicode(r.context["{{key}}"]), u"{{value}}")"""
+'''        self.assertEqual(unicode(r.context["{{key}}"]), u"""{{value}}""")'''
 
 class Processor(base.Processer):
     """Processes the serialized data. Generally to create some sort of test cases"""