Use renderers.

3 files changed, 3 insertions, 64 deletions

diff --git a/docs/narr/MyProject/myproject/configure.zcml b/docs/narr/MyProject/myproject/configure.zcml
index aa98296c5..038f04da4 100644
--- a/docs/narr/MyProject/myproject/configure.zcml
+++ b/docs/narr/MyProject/myproject/configure.zcml
@@ -6,6 +6,7 @@
   <view
      for=".models.MyModel"
      view=".views.my_view"
+     renderer="templates/mytemplate.pt"
      />
 
   <static
diff --git a/docs/narr/MyProject/myproject/tests.py b/docs/narr/MyProject/myproject/tests.py
index 6f287c02b..af66e5bef 100644
--- a/docs/narr/MyProject/myproject/tests.py
+++ b/docs/narr/MyProject/myproject/tests.py
@@ -3,71 +3,13 @@ import unittest
 from repoze.bfg import testing
 
 class ViewTests(unittest.TestCase):
-
     """ These tests are unit tests for the view.  They test the
     functionality of *only* the view.  They register and use dummy
     implementations of repoze.bfg functionality to allow you to avoid
     testing 'too much'"""
-
-    def setUp(self):
-        """ cleanUp() is required to clear out the application registry
-        between tests (done in setUp for good measure too)
-        """
-        testing.cleanUp()
-        
-    def tearDown(self):
-        """ cleanUp() is required to clear out the application registry
-        between tests
-        """
-        testing.cleanUp()
-
-    def test_my_view(self):
-        from myproject.views import my_view
-        context = testing.DummyModel()
-        request = testing.DummyRequest()
-        renderer = testing.registerDummyRenderer('templates/mytemplate.pt')
-        response = my_view(context, request)
-        renderer.assert_(project='MyProject')
-
-class ViewIntegrationTests(unittest.TestCase):
-    """ These tests are integration tests for the view.  These test
-    the functionality the view *and* its integration with the rest of
-    the repoze.bfg framework.  They cause the entire environment to be
-    set up and torn down as if your application was running 'for
-    real'.  This is a heavy-hammer way of making sure that your tests
-    have enough context to run properly, and it tests your view's
-    integration with the rest of BFG.  You should not use this style
-    of test to perform 'true' unit testing as tests will run faster
-    and will be easier to write if you use the testing facilities
-    provided by bfg and only the registrations you need, as in the
-    above ViewTests.
-    """
-    def setUp(self):
-        """ This sets up the application registry with the
-        registrations your application declares in its configure.zcml
-        (including dependent registrations for repoze.bfg itself).
-        """
-        testing.cleanUp()
-        import myproject
-        import zope.configuration.xmlconfig
-        zope.configuration.xmlconfig.file('configure.zcml',
-                                          package=myproject)
-
-    def tearDown(self):
-        """ Clear out the application registry """
-        testing.cleanUp()
-
     def test_my_view(self):
         from myproject.views import my_view
         context = testing.DummyModel()
         request = testing.DummyRequest()
-        result = my_view(context, request)
-        self.assertEqual(result.status, '200 OK')
-        body = result.app_iter[0]
-        self.failUnless('Welcome to' in body)
-        self.assertEqual(len(result.headerlist), 2)
-        self.assertEqual(result.headerlist[0],
-                         ('content-type', 'text/html; charset=UTF-8'))
-        self.assertEqual(result.headerlist[1], ('Content-Length',
-                                                str(len(body))))
+        self.assertEqual(my_view(context, request), {'project':'MyProject'})
 
diff --git a/docs/narr/MyProject/myproject/views.py b/docs/narr/MyProject/myproject/views.py
index 486019bd7..036b140fb 100644
--- a/docs/narr/MyProject/myproject/views.py
+++ b/docs/narr/MyProject/myproject/views.py
@@ -1,6 +1,2 @@
-from repoze.bfg.chameleon_zpt import render_template_to_response
-
 def my_view(context, request):
-    return render_template_to_response('templates/mytemplate.pt',
-                                       request = request,
-                                       project = 'MyProject')
+    return {'project':'MyProject'}