From a7f13ff10e0eae01b958738e41d9d172af2916dd Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Mon, 1 Jun 2009 07:20:48 +0000
Subject: - It was not possible to register a custom ``IRoutesContextFactory`` 
  for use as a default context factory as documented in the "Hooks"   chapter.

---
 repoze/bfg/tests/test_router.py      | 32 ++++++++++++++++++++++++++++++++
 repoze/bfg/tests/test_urldispatch.py | 20 +++-----------------
 2 files changed, 35 insertions(+), 17 deletions(-)

(limited to 'repoze/bfg/tests')

diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py
index 09c3f7c1f..d07efcc69 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/repoze/bfg/tests/test_router.py
@@ -911,6 +911,38 @@ class MakeAppTests(unittest.TestCase):
         self.assertEqual(len(logger.messages), 1)
         self.failUnless('ISecurityPolicy' in logger.messages[0])
 
+    def test_custom_default_context_factory_nodecorate(self):
+        from repoze.bfg.tests import routesapp
+        from zope.component import getGlobalSiteManager
+        from repoze.bfg.interfaces import IRoutesContextFactory
+        from repoze.bfg.interfaces import IRoutesMapper
+        class Dummy(object):
+            pass
+        gsm = getGlobalSiteManager()
+        gsm.registerUtility(Dummy, IRoutesContextFactory)
+        app = self._callFUT(None, routesapp, registry=gsm)
+        mapper = gsm.getUtility(IRoutesMapper)
+        self.assertEqual(mapper.default_context_factory,
+                         Dummy)
+        self.assertEqual(mapper.decorate_context, True)
+
+    def test_custom_default_context_factory_decorate(self):
+        from repoze.bfg.tests import routesapp
+        from zope.component import getGlobalSiteManager
+        from repoze.bfg.interfaces import IRoutesContextFactory
+        from repoze.bfg.interfaces import IRoutesMapper
+        from repoze.bfg.interfaces import IRoutesContext
+        from zope.interface import implements
+        class Dummy(object):
+            implements(IRoutesContext)
+        gsm = getGlobalSiteManager()
+        gsm.registerUtility(Dummy, IRoutesContextFactory)
+        app = self._callFUT(None, routesapp, registry=gsm)
+        mapper = gsm.getUtility(IRoutesMapper)
+        self.assertEqual(mapper.default_context_factory,
+                         Dummy)
+        self.assertEqual(mapper.decorate_context, False)
+
 class TestDefaultForbiddenView(unittest.TestCase):
     def _callFUT(self, context, request):
         from repoze.bfg.router import default_forbidden_view
diff --git a/repoze/bfg/tests/test_urldispatch.py b/repoze/bfg/tests/test_urldispatch.py
index 92564146e..2b4578f94 100644
--- a/repoze/bfg/tests/test_urldispatch.py
+++ b/repoze/bfg/tests/test_urldispatch.py
@@ -22,32 +22,18 @@ class RoutesRootFactoryTests(unittest.TestCase):
         klass = self._getTargetClass()
         return klass(get_root)
 
-    def test_init_custom_default_context_factory_dont_decorate(self):
+    def test_init_default_context_factory(self):
         from zope.component import getGlobalSiteManager
         from repoze.bfg.interfaces import IRoutesContextFactory
+        from repoze.bfg.urldispatch import DefaultRoutesContext
         class Dummy(object):
             pass
         gsm = getGlobalSiteManager()
         gsm.registerUtility(Dummy, IRoutesContextFactory)
         mapper = self._makeOne(None)
-        self.assertEqual(mapper.default_context_factory,
-                         Dummy)
+        self.assertEqual(mapper.default_context_factory, DefaultRoutesContext)
         self.assertEqual(mapper.decorate_context, True)
 
-    def test_init_custom_default_context_factory_decorate(self):
-        from zope.component import getGlobalSiteManager
-        from repoze.bfg.interfaces import IRoutesContextFactory
-        from repoze.bfg.interfaces import IRoutesContext
-        from zope.interface import implements
-        class Dummy(object):
-            implements(IRoutesContext)
-        gsm = getGlobalSiteManager()
-        gsm.registerUtility(Dummy, IRoutesContextFactory)
-        mapper = self._makeOne(None)
-        self.assertEqual(mapper.default_context_factory,
-                         Dummy)
-        self.assertEqual(mapper.decorate_context, False)
-
     def test_no_route_matches(self):
         marker = ()
         get_root = make_get_root(marker)
-- 
cgit v1.2.3