diff options
Diffstat (limited to 'repoze/bfg/tests')
| -rw-r--r-- | repoze/bfg/tests/test_configuration.py | 83 | ||||
| -rw-r--r-- | repoze/bfg/tests/test_zcml.py | 12 |
2 files changed, 4 insertions, 91 deletions
diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py index 2e4ba3a18..78e1949e4 100644 --- a/repoze/bfg/tests/test_configuration.py +++ b/repoze/bfg/tests/test_configuration.py @@ -1186,89 +1186,6 @@ class ConfiguratorTests(unittest.TestCase): wrapper = self._getViewCallable(config, IOther, request_type) self.assertEqual(wrapper, None) - def test_add_route_with_view_request_method(self): - config = self._makeOne() - view = lambda *arg: 'OK' - config.add_route('name', 'path', view=view, view_request_method='GET') - request_type = self._getRouteRequestIface(config, 'name') - wrapper = self._getViewCallable(config, None, request_type) - self._assertRoute(config, 'name', 'path') - request = self._makeRequest(config) - request.method = 'GET' - self.assertEqual(wrapper(None, request), 'OK') - request = self._makeRequest(config) - request.method = 'POST' - self._assertNotFound(wrapper, None, request) - - def test_add_route_with_view_header(self): - config = self._makeOne() - view = lambda *arg: 'OK' - config.add_route('name', 'path', view=view, view_header='Host') - request_type = self._getRouteRequestIface(config, 'name') - wrapper = self._getViewCallable(config, None, request_type) - self._assertRoute(config, 'name', 'path') - request = self._makeRequest(config) - request.headers = {'Host':'abc'} - self.assertEqual(wrapper(None, request), 'OK') - request = self._makeRequest(config) - request.headers = {} - self._assertNotFound(wrapper, None, request) - - def test_add_route_with_view_xhr(self): - config = self._makeOne() - view = lambda *arg: 'OK' - config.add_route('name', 'path', view=view, view_xhr=True) - request_type = self._getRouteRequestIface(config, 'name') - wrapper = self._getViewCallable(config, None, request_type) - self._assertRoute(config, 'name', 'path') - request = self._makeRequest(config) - request.is_xhr = True - self.assertEqual(wrapper(None, request), 'OK') - request = self._makeRequest(config) - request.is_xhr = False - self._assertNotFound(wrapper, None, request) - - def test_add_route_with_view_path_info(self): - config = self._makeOne() - view = lambda *arg: 'OK' - config.add_route('name', 'path', view=view, view_path_info='/foo') - request_type = self._getRouteRequestIface(config, 'name') - wrapper = self._getViewCallable(config, None, request_type) - self._assertRoute(config, 'name', 'path') - request = self._makeRequest(config) - request.path_info = '/foo' - self.assertEqual(wrapper(None, request), 'OK') - request = self._makeRequest(config) - request.path_info = '/' - self._assertNotFound(wrapper, None, request) - - def test_add_route_with_view_accept(self): - config = self._makeOne() - view = lambda *arg: 'OK' - config.add_route('name', 'path', view=view, view_accept='text/xml') - request_type = self._getRouteRequestIface(config, 'name') - wrapper = self._getViewCallable(config, None, request_type) - self._assertRoute(config, 'name', 'path') - request = self._makeRequest(config) - request.accept = ['text/xml'] - self.assertEqual(wrapper(None, request), 'OK') - request = self._makeRequest(config) - request.accept = ['text/html'] - self._assertNotFound(wrapper, None, request) - - def test_add_route_with_view_containment(self): - from zope.interface import directlyProvides - config = self._makeOne() - view = lambda *arg: 'OK' - config.add_route('name', 'path', view=view, view_containment=IDummy) - request_type = self._getRouteRequestIface(config, 'name') - wrapper = self._getViewCallable(config, None, request_type) - self._assertRoute(config, 'name', 'path') - context = DummyContext() - directlyProvides(context, IDummy) - self.assertEqual(wrapper(context, None), 'OK') - self._assertNotFound(wrapper, None, None) - def test_add_route_with_view_renderer(self): config = self._makeOne() self._registerRenderer(config) diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py index 2d9d59b64..1784a6aa8 100644 --- a/repoze/bfg/tests/test_zcml.py +++ b/repoze/bfg/tests/test_zcml.py @@ -521,8 +521,7 @@ class TestRouteDirective(unittest.TestCase): reg = get_current_registry() request_type = reg.getUtility(IRouteRequest, 'name') view_discriminator = view_action['discriminator'] - discrim = ('view', None, '', None, IView, None, None, None, - 'name', None, False, None, None, None) + discrim = ('view', None, '', None, IView, 'name', None) self.assertEqual(view_discriminator, discrim) wrapped = reg.adapters.lookup((request_type, Interface), IView, name='') self.failUnless(wrapped) @@ -548,8 +547,7 @@ class TestRouteDirective(unittest.TestCase): reg = get_current_registry() request_type = reg.getUtility(IRouteRequest, 'name') view_discriminator = view_action['discriminator'] - discrim = ('view', IDummy, '', None, IView, None, None, None, - 'name', None, False, None, None, None) + discrim = ('view', IDummy, '', None, IView, 'name', None) self.assertEqual(view_discriminator, discrim) wrapped = reg.adapters.lookup((request_type, IDummy), IView, name='') self.failUnless(wrapped) @@ -578,8 +576,7 @@ class TestRouteDirective(unittest.TestCase): reg = get_current_registry() request_type = reg.getUtility(IRouteRequest, 'name') view_discriminator = view_action['discriminator'] - discrim = ('view', IDummy, '', None, IView, None, None, None, - 'name', None, False, None, None, None) + discrim = ('view', IDummy, '', None, IView, 'name', None) self.assertEqual(view_discriminator, discrim) wrapped = reg.adapters.lookup((request_type, IDummy), IView, name='') self.failUnless(wrapped) @@ -615,8 +612,7 @@ class TestRouteDirective(unittest.TestCase): view_action = actions[1] request_type = reg.getUtility(IRouteRequest, 'name') view_discriminator = view_action['discriminator'] - discrim = ('view', None, '', None, IView, None, None, None, - 'name', None, False, None, None, None) + discrim = ('view', None, '', None, IView, 'name', None) self.assertEqual(view_discriminator, discrim) wrapped = reg.adapters.lookup((request_type, Interface), IView, name='') self.failUnless(wrapped) |