summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2013-09-05 21:21:54 -0600
committerBert JW Regeer <bertjw@regeer.org>2013-09-05 21:21:54 -0600
commit7b5becddb6ff1347a2a1a4e5b63fdde1e506bcc3 (patch)
treeb95c672c375cffc69390435eb8e2f84ac0b0b52b
parenta18f3060e3f77c791baa9151e9c80eac6f8e339e (diff)
downloadpyramid-7b5becddb6ff1347a2a1a4e5b63fdde1e506bcc3.tar.gz
pyramid-7b5becddb6ff1347a2a1a4e5b63fdde1e506bcc3.tar.bz2
pyramid-7b5becddb6ff1347a2a1a4e5b63fdde1e506bcc3.zip
Replace .txt renderer with JSON
Update tests expected results so that they now correctly look for the return value returned from the JSON renderer.
-rw-r--r--pyramid/tests/test_config/test_init.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py
index 531357e7f..ccecdc0fd 100644
--- a/pyramid/tests/test_config/test_init.py
+++ b/pyramid/tests/test_config/test_init.py
@@ -69,9 +69,6 @@ class ConfiguratorTests(unittest.TestCase):
config.commit()
self.assertTrue(config.registry.getUtility(IRendererFactory, 'json'))
self.assertTrue(config.registry.getUtility(IRendererFactory, 'string'))
- if not PYPY:
- self.assertTrue(config.registry.getUtility(IRendererFactory, '.pt'))
- self.assertTrue(config.registry.getUtility(IRendererFactory,'.txt'))
def test_begin(self):
from pyramid.config import Configurator
@@ -1324,11 +1321,11 @@ class TestConfiguratorDeprecatedFeatures(unittest.TestCase):
self._registerRenderer(config)
view = lambda *arg: 'OK'
config.add_route('name', 'path', view=view,
- view_renderer='files/minimal.txt')
+ view_renderer='json')
request_type = self._getRouteRequestIface(config, 'name')
wrapper = self._getViewCallable(config, None, request_type)
self._assertRoute(config, 'name', 'path')
- self.assertEqual(wrapper(None, None).body, b'Hello!')
+ self.assertEqual(wrapper(None, None).body, b'"OK"')
def test_add_route_with_view_attr(self):
from pyramid.renderers import null_renderer
@@ -1352,11 +1349,11 @@ class TestConfiguratorDeprecatedFeatures(unittest.TestCase):
self._registerRenderer(config)
view = lambda *arg: 'OK'
config.add_route('name', 'path', view=view,
- renderer='files/minimal.txt')
+ renderer='json')
request_type = self._getRouteRequestIface(config, 'name')
wrapper = self._getViewCallable(config, None, request_type)
self._assertRoute(config, 'name', 'path')
- self.assertEqual(wrapper(None, None).body, b'Hello!')
+ self.assertEqual(wrapper(None, None).body, b'"OK"')
def test_add_route_with_view_permission(self):
from pyramid.interfaces import IAuthenticationPolicy