From 15a3c6f561563eb53ff1cc3637fc6afa75da9e89 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 20 Nov 2009 05:38:38 +0000 Subject: Passable stab at supporting an imperative mode. ZCML directives which accept paths now register absolute paths, while imperative registrations now register resource specifications. --- repoze/bfg/tests/test_router.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'repoze/bfg/tests/test_router.py') diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py index e747a26e6..2fc31419a 100644 --- a/repoze/bfg/tests/test_router.py +++ b/repoze/bfg/tests/test_router.py @@ -529,25 +529,21 @@ class TestMakeApp(unittest.TestCase): def test_it(self): settings = {'a':1} - package = object() rootfactory = object() - app = self._callFUT(rootfactory, package, settings=settings, + app = self._callFUT(rootfactory, settings=settings, Configurator=DummyConfigurator) self.assertEqual(app.root_factory, rootfactory) self.assertEqual(app.settings, settings) - self.assertEqual(app.package, package) - self.assertEqual(app.filename, 'configure.zcml') + self.assertEqual(app.spec, 'configure.zcml') def test_it_options_means_settings(self): settings = {'a':1} - package = object() rootfactory = object() - app = self._callFUT(rootfactory, package, options=settings, + app = self._callFUT(rootfactory, options=settings, Configurator=DummyConfigurator) self.assertEqual(app.root_factory, rootfactory) self.assertEqual(app.settings, settings) - self.assertEqual(app.package, package) - self.assertEqual(app.filename, 'configure.zcml') + self.assertEqual(app.spec, 'configure.zcml') class DummyContext: pass @@ -616,10 +612,8 @@ class DummyConfigurator(object): def make_wsgi_app(self): return self - def declarative(self, root_factory=None, package=None, - filename=None, settings=None): + def declarative(self, root_factory=None, spec=None, settings=None): self.root_factory = root_factory - self.package = package - self.filename = filename + self.spec = spec self.settings = settings -- cgit v1.2.3