summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-02-20 15:56:22 +0000
committerChris McDonough <chrism@agendaless.com>2009-02-20 15:56:22 +0000
commite02ba1e57d65415878895c99d5b044578ed5e850 (patch)
treeafb6c1a01c46fdb7848a2ff29916db62007a9f59
parentb1de627f08e4504a804a49cecacfdd306217f908 (diff)
downloadpyramid-e02ba1e57d65415878895c99d5b044578ed5e850.tar.gz
pyramid-e02ba1e57d65415878895c99d5b044578ed5e850.tar.bz2
pyramid-e02ba1e57d65415878895c99d5b044578ed5e850.zip
- Make it possible to have ``testing.DummyTemplateRenderer`` return
some nondefault string representation.
-rw-r--r--CHANGES.txt3
-rw-r--r--repoze/bfg/testing.py5
-rw-r--r--repoze/bfg/tests/test_testing.py11
3 files changed, 14 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 85b0a8054..283567f22 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,9 @@ Next release
None names in intermediate nodes will replace the None with the
empty string, and, as a result, the error won't be raised. Of
course the URL or path will still be bogus.
+
+- Make it possible to have ``testing.DummyTemplateRenderer`` return
+ some nondefault string representation.
0.6.9 (2009-02-16)
==================
diff --git a/repoze/bfg/testing.py b/repoze/bfg/testing.py
index 9f62b9b21..1ad8ddf17 100644
--- a/repoze/bfg/testing.py
+++ b/repoze/bfg/testing.py
@@ -184,15 +184,16 @@ class DummyTemplateRenderer:
key/value pairs.
"""
- def __init__(self):
+ def __init__(self, string_response=''):
self._received = {}
+ self.string_response = string_response
def implementation(self):
return self
def __call__(self, **kw):
self._received.update(kw)
- return ''
+ return self.string_response
def __getattr__(self, k):
""" Backwards compatibiity """
diff --git a/repoze/bfg/tests/test_testing.py b/repoze/bfg/tests/test_testing.py
index 8aac7d5a0..1154fc27b 100644
--- a/repoze/bfg/tests/test_testing.py
+++ b/repoze/bfg/tests/test_testing.py
@@ -424,12 +424,12 @@ class TestDummyRequest(unittest.TestCase):
self.assertEqual(request.water, 1)
class TestDummyTemplateRenderer(unittest.TestCase):
- def _getTargetClass(self):
+ def _getTargetClass(self, ):
from repoze.bfg.testing import DummyTemplateRenderer
return DummyTemplateRenderer
- def _makeOne(self,):
- return self._getTargetClass()()
+ def _makeOne(self, string_response=''):
+ return self._getTargetClass()(string_response=string_response)
def test_implementation(self):
renderer = self._makeOne()
@@ -448,4 +448,9 @@ class TestDummyTemplateRenderer(unittest.TestCase):
self.assertRaises(AssertionError, renderer.assert_, b=3)
self.failUnless(renderer.assert_(a=1, b=2))
+ def test_nondefault_string_response(self):
+ renderer = self._makeOne('abc')
+ result = renderer(a=1, b=2)
+ self.assertEqual(result, 'abc')
+