- 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``.

1 files changed, 12 insertions, 8 deletions

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
+