- The ``repoze.bfg.testing.registerDummyRenderer`` API has been

  deprecated in favor of
  ``repoze.bfg.testing.registerTemplateRenderer``.  A deprecation
  warning is *not* issued at import time for the former name; it will
  exist "forever".

- The ``repoze.bfg.templating.renderer_from_cache`` function has been
  moved to ``repoze.bfg.renderer.template_renderer_factory``.  This
  was never an API, but code in the wild was spotted that used it.  A
  deprecation warning is issued at import time for the former.

- Better error message when a wrapper view returns None.

2 files changed, 16 insertions, 5 deletions

diff --git a/repoze/bfg/tests/test_testing.py b/repoze/bfg/tests/test_testing.py
index f479106ce..6c6b55337 100644
--- a/repoze/bfg/tests/test_testing.py
+++ b/repoze/bfg/tests/test_testing.py
@@ -54,20 +54,20 @@ class TestTestingFunctions(unittest.TestCase):
         from repoze.bfg.traversal import find_model
         self.assertEqual(find_model(None, '/ob1'), ob1)
 
-    def test_registerDummyRenderer(self):
+    def test_registerTemplateRenderer(self):
         from repoze.bfg import testing
-        renderer = testing.registerDummyRenderer('templates/foo')
+        renderer = testing.registerTemplateRenderer('templates/foo')
         from repoze.bfg.testing import DummyTemplateRenderer
         self.failUnless(isinstance(renderer, DummyTemplateRenderer))
         from repoze.bfg.chameleon_zpt import render_template_to_response
         response = render_template_to_response('templates/foo', foo=1, bar=2)
         self.assertEqual(dict(foo=1, bar=2), renderer._received)
 
-    def test_registerDummyRenderer_explicitrenderer(self):
+    def test_registerTemplateRenderer_explicitrenderer(self):
         from repoze.bfg import testing
         def renderer(kw):
             raise ValueError
-        renderer = testing.registerDummyRenderer('templates/foo', renderer)
+        renderer = testing.registerTemplateRenderer('templates/foo', renderer)
         from repoze.bfg.chameleon_zpt import render_template_to_response
         self.assertRaises(ValueError, render_template_to_response,
                           'templates/foo', foo=1, bar=2)
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 21d55504d..7af9ab193 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -1376,7 +1376,8 @@ class TestDeriveView(unittest.TestCase):
             return Response('outer ' + request.wrapped_body)
         sm = getSiteManager()
         sm.registerAdapter(outer_view, (None, None), IView, 'owrap')
-        result = self._callFUT(inner_view, wrapper_viewname='owrap')
+        result = self._callFUT(inner_view, viewname='inner',
+                               wrapper_viewname='owrap')
         self.failIf(result is inner_view)
         self.assertEqual(inner_view.__module__, result.__module__)
         self.assertEqual(inner_view.__doc__, result.__doc__)
@@ -1384,6 +1385,16 @@ class TestDeriveView(unittest.TestCase):
         response = result(None, request)
         self.assertEqual(response.body, 'outer OK')
 
+    def test_view_with_wrapper_viewname_notfound(self):
+        from webob import Response
+        inner_response = Response('OK')
+        def inner_view(context, request):
+            return inner_response
+        request = DummyRequest()
+        wrapped = self._callFUT(
+            inner_view, viewname='inner', wrapper_viewname='owrap')
+        result = self.assertRaises(ValueError, wrapped, None, request)
+
 class TestConnectRouteFunction(unittest.TestCase):
     def setUp(self):
         cleanUp()