Change the semantics of IForbiddenAppFactory.

2 files changed, 18 insertions, 2 deletions

diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py
index d7c55ae78..99316f056 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/repoze/bfg/tests/test_router.py
@@ -137,6 +137,22 @@ class RouterTests(unittest.TestCase):
         self.failUnless('which does not have a "forbidden" method'
                         in logger.messages[0])
 
+    def test_secpol_with_iunauthorized_appfactory(self):
+        from repoze.bfg.interfaces import IUnauthorizedAppFactory
+        environ = self._makeEnviron()
+        context = DummyContext()
+        self._registerTraverserFactory(context)
+        rootfactory = self._registerRootFactory(None)
+        logger = self._registerLogger()
+        secpol = self._registerSecurityPolicy()
+        def factory():
+            return 'yo'
+        self.registry.registerUtility(factory, IUnauthorizedAppFactory)
+        router = self._makeOne()
+        self.assertEqual(len(logger.messages), 1)
+        self.failUnless('IForbiddenAppFactory' in logger.messages[0])
+        self.assertEqual(router.forbidden_app_factory(None, None), 'yo')
+
     def test_inotfound_appfactory_override(self):
         from repoze.bfg.interfaces import INotFoundAppFactory
         def app():
diff --git a/repoze/bfg/tests/test_security.py b/repoze/bfg/tests/test_security.py
index b596a1547..ffac19e0d 100644
--- a/repoze/bfg/tests/test_security.py
+++ b/repoze/bfg/tests/test_security.py
@@ -245,7 +245,7 @@ class TestACLSecurityPolicy(unittest.TestCase):
 
     def test_forbidden(self):
         policy = self._makeOne(lambda *arg: None)
-        forbidden_app = policy.forbidden()
+        forbidden_app = policy.forbidden(None, None)
         environ = {}
         result = []
         def start_response(status, headers):
@@ -444,7 +444,7 @@ class TestInheritingACLSecurityPolicy(unittest.TestCase):
 
     def test_forbidden(self):
         policy = self._makeOne(lambda *arg: None)
-        forbidden_app = policy.forbidden()
+        forbidden_app = policy.forbidden(None, None)
         environ = {}
         result = []
         def start_response(status, headers):