- Move (non-API) default_view, default_forbidden_view, and

  default_notfound_view functions into the ``repoze.bfg.view`` module
  (moved from ``repoze.bfg.router``).

2 files changed, 46 insertions, 19 deletions

diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py
index 8c3e23c91..cf9f2a835 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/repoze/bfg/tests/test_router.py
@@ -140,7 +140,7 @@ class RouterTests(unittest.TestCase):
     def test_iforbiddenview_nooverride(self):
         context = DummyContext()
         router = self._makeOne()
-        from repoze.bfg.router import default_forbidden_view
+        from repoze.bfg.view import default_forbidden_view
         self.assertEqual(router.forbidden_view, default_forbidden_view)
 
     def test_inotfoundview_override(self):
@@ -154,7 +154,7 @@ class RouterTests(unittest.TestCase):
     def test_inotfoundview_nooverride(self):
         context = DummyContext()
         router = self._makeOne()
-        from repoze.bfg.router import default_notfound_view
+        from repoze.bfg.view import default_notfound_view
         self.assertEqual(router.notfound_view, default_notfound_view)
 
     def test_call_no_view_registered_no_isettings(self):
@@ -885,23 +885,6 @@ class MakeAppTests(unittest.TestCase):
                          authzpolicy)
         self.assertEqual(len(logger.messages), 1) # deprecation warning
 
-class TestDefaultForbiddenView(unittest.TestCase):
-    def _callFUT(self, context, request):
-        from repoze.bfg.router import default_forbidden_view
-        return default_forbidden_view(context, request)
-
-    def test_nomessage(self):
-        request = DummyRequest({})
-        context = DummyContext()
-        response = self._callFUT(context, request)
-        self.failUnless('<code></code>' in response.body)
-
-    def test_withmessage(self):
-        request = DummyRequest({'repoze.bfg.message':'abc&123'})
-        context = DummyContext()
-        response = self._callFUT(context, request)
-        self.failUnless('<code>abc&amp;123</code>' in response.body)
-
 class TestDefaultRootFactory(unittest.TestCase):
     def _getTargetClass(self):
         from repoze.bfg.router import DefaultRootFactory
diff --git a/repoze/bfg/tests/test_view.py b/repoze/bfg/tests/test_view.py
index 5b870fa7d..a35930f69 100644
--- a/repoze/bfg/tests/test_view.py
+++ b/repoze/bfg/tests/test_view.py
@@ -452,10 +452,54 @@ class TestBFGViewDecorator(unittest.TestCase):
         self.assertEqual(result.context, None)
         self.assertEqual(result.request, None)
 
+class TestDefaultForbiddenView(unittest.TestCase):
+    def _callFUT(self, context, request):
+        from repoze.bfg.view import default_forbidden_view
+        return default_forbidden_view(context, request)
+
+    def test_nomessage(self):
+        request = DummyRequest({})
+        context = DummyContext()
+        response = self._callFUT(context, request)
+        self.assertEqual(response.status, '401 Unauthorized')
+        self.failUnless('<code></code>' in response.body)
+
+    def test_withmessage(self):
+        request = DummyRequest({'repoze.bfg.message':'abc&123'})
+        context = DummyContext()
+        response = self._callFUT(context, request)
+        self.assertEqual(response.status, '401 Unauthorized')
+        self.failUnless('<code>abc&amp;123</code>' in response.body)
+
+class TestDefaultNotFoundView(unittest.TestCase):
+    def _callFUT(self, context, request):
+        from repoze.bfg.view import default_notfound_view
+        return default_notfound_view(context, request)
+
+    def test_nomessage(self):
+        request = DummyRequest({})
+        context = DummyContext()
+        response = self._callFUT(context, request)
+        self.assertEqual(response.status, '404 Not Found')
+        self.failUnless('<code></code>' in response.body)
+
+    def test_withmessage(self):
+        request = DummyRequest({'repoze.bfg.message':'abc&123'})
+        context = DummyContext()
+        response = self._callFUT(context, request)
+        self.assertEqual(response.status, '404 Not Found')
+        self.failUnless('<code>abc&amp;123</code>' in response.body)
+
+
 class DummyContext:
     pass
 
 class DummyRequest:
+    def __init__(self, environ=None):
+        if environ is None:
+            environ = {}
+        self.environ = environ
+        
     def get_response(self, application):
         return application