- The ``bfgshell`` command did not function properly; it was still

  expecting to be able to call the root factory with a bare
  ``environ`` rather than a request object.

- The ``repoze.bfg.scripting.get_app`` function now expects a
  ``request`` object as its second argument rather than an
  ``environ``.

4 files changed, 32 insertions, 27 deletions

diff --git a/repoze/bfg/tests/test_paster.py b/repoze/bfg/tests/test_paster.py
index 7752e1684..d9cbefb5e 100644
--- a/repoze/bfg/tests/test_paster.py
+++ b/repoze/bfg/tests/test_paster.py
@@ -27,7 +27,7 @@ class TestBFGShellCommand(unittest.TestCase):
         self.assertEqual(len(app.threadlocal_manager.pushed), 1)
         pushed = app.threadlocal_manager.pushed[0]
         self.assertEqual(pushed['registry'], dummy_registry)
-        self.assertEqual(pushed['request'], None)
+        self.assertEqual(pushed['request'].environ, {})
         self.assertEqual(interact.local, {'root':dummy_root})
         self.failUnless(interact.banner)
         self.assertEqual(len(app.threadlocal_manager.popped), 1)
@@ -51,7 +51,7 @@ class TestBFGShellCommand(unittest.TestCase):
         self.assertEqual(len(app.threadlocal_manager.pushed), 1)
         pushed = app.threadlocal_manager.pushed[0]
         self.assertEqual(pushed['registry'], dummy_registry)
-        self.assertEqual(pushed['request'], None)
+        self.assertEqual(pushed['request'].environ, {})
         self.assertEqual(dummy_shell_factory.shell.local_ns,{'root':dummy_root})
         self.assertEqual(dummy_shell_factory.shell.global_ns, {})
         self.failUnless('\n\n' in dummy_shell_factory.shell.IP.BANNER)
diff --git a/repoze/bfg/tests/test_request.py b/repoze/bfg/tests/test_request.py
index 2ecb060cc..eb26b07cf 100644
--- a/repoze/bfg/tests/test_request.py
+++ b/repoze/bfg/tests/test_request.py
@@ -168,6 +168,24 @@ class Test_add_global_response_headers(unittest.TestCase):
         self._callFUT(request, [('c', 1)])
         self.assertEqual(request.global_response_headers, headers + [('c', 1)])
 
+class TestFakeRequest(unittest.TestCase):
+    def _makeOne(self, environ):
+        from repoze.bfg.request import FakeRequest
+        return FakeRequest(environ)
+
+    def test_environ(self):
+        environ = {'a':1, 'b':2}
+        request = self._makeOne(environ)
+        self.assertEqual(request.environ['a'], 1)
+        self.assertEqual(request.environ['b'], 2)
+        
+    def test_asdict(self):
+        environ = {'a':1, 'b':2}
+        request = self._makeOne(environ)
+        self.assertEqual(request['a'], 1)
+        self.assertEqual(request['b'], 2)
+
+
 class DummyRequest:
     def __init__(self, environ=None):
         if environ is None:
diff --git a/repoze/bfg/tests/test_scripting.py b/repoze/bfg/tests/test_scripting.py
index 514b02dca..41542f457 100644
--- a/repoze/bfg/tests/test_scripting.py
+++ b/repoze/bfg/tests/test_scripting.py
@@ -1,29 +1,29 @@
 import unittest
 
 class TestGetRoot(unittest.TestCase):
-    def _callFUT(self, app, environ=None):
+    def _callFUT(self, app, request=None):
         from repoze.bfg.paster import get_root
-        return get_root(app, environ)
+        return get_root(app, request)
 
-    def test_it_noenviron(self):
+    def test_it_norequest(self):
         app = DummyApp()
         root, closer = self._callFUT(app)
         self.assertEqual(len(app.threadlocal_manager.pushed), 1)
         pushed = app.threadlocal_manager.pushed[0]
         self.assertEqual(pushed['registry'], dummy_registry)
-        self.assertEqual(pushed['request'], None)
+        self.assertEqual(pushed['request'].environ, {})
         self.assertEqual(len(app.threadlocal_manager.popped), 0)
         closer()
         self.assertEqual(len(app.threadlocal_manager.popped), 1)
 
-    def test_it_withenviron(self):
+    def test_it_withrequest(self):
         app = DummyApp()
-        environ = {}
-        root, closer = self._callFUT(app, environ)
+        request = DummyRequest({})
+        root, closer = self._callFUT(app, request)
         self.assertEqual(len(app.threadlocal_manager.pushed), 1)
         pushed = app.threadlocal_manager.pushed[0]
         self.assertEqual(pushed['registry'], dummy_registry)
-        self.assertEqual(pushed['request'], None)
+        self.assertEqual(pushed['request'], request)
         self.assertEqual(len(app.threadlocal_manager.popped), 0)
         closer()
         self.assertEqual(len(app.threadlocal_manager.popped), 1)
@@ -54,3 +54,7 @@ class DummyThreadLocalManager:
     def pop(self):
         self.popped.append(True)
         
+class DummyRequest:
+    def __init__(self, environ):
+        self.environ = environ
+        
diff --git a/repoze/bfg/tests/test_traversal.py b/repoze/bfg/tests/test_traversal.py
index ba9fc8b30..aceed1076 100644
--- a/repoze/bfg/tests/test_traversal.py
+++ b/repoze/bfg/tests/test_traversal.py
@@ -970,23 +970,6 @@ class TraverseTests(unittest.TestCase):
         self.assertEqual(result['view_name'], '')
         self.assertEqual(result['context'], model)
 
-class TestFakeRequest(unittest.TestCase):
-    def _makeOne(self, environ):
-        from repoze.bfg.traversal import FakeRequest
-        return FakeRequest(environ)
-
-    def test_environ(self):
-        environ = {'a':1, 'b':2}
-        request = self._makeOne(environ)
-        self.assertEqual(request.environ['a'], 1)
-        self.assertEqual(request.environ['b'], 2)
-        
-    def test_asdict(self):
-        environ = {'a':1, 'b':2}
-        request = self._makeOne(environ)
-        self.assertEqual(request['a'], 1)
-        self.assertEqual(request['b'], 2)
-
 def make_traverser(result):
     class DummyTraverser(object):
         def __init__(self, context):