From 333bd06861e55f97dfcaeebff100657734829add Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 24 Jan 2010 08:45:35 +0000 Subject: Merge reversepolarity branch. --- repoze/bfg/tests/test_integration.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'repoze/bfg/tests/test_integration.py') diff --git a/repoze/bfg/tests/test_integration.py b/repoze/bfg/tests/test_integration.py index 1c6fdd01e..6affe24e1 100644 --- a/repoze/bfg/tests/test_integration.py +++ b/repoze/bfg/tests/test_integration.py @@ -36,7 +36,7 @@ class WGSIAppPlusBFGViewTests(unittest.TestCase): config = Configurator() config.scan(test_integration) reg = config.registry - view = reg.adapters.lookup((INothing, IRequest), IView, name='') + view = reg.adapters.lookup((IRequest, INothing), IView, name='') self.assertEqual(view, wsgiapptest) here = os.path.dirname(__file__) @@ -113,6 +113,29 @@ class TestCCBug(TwillBase): self.assertEqual(browser.get_code(), 200) self.assertEqual(browser.get_html(), 'juri') +class TestHybridApp(TwillBase): + # make sure views registered for a route "win" over views registered + # without one, even though the context of the non-route view may + # be more specific than the route view. + config = 'repoze.bfg.tests.hybridapp:configure.zcml' + def test_it(self): + import twill.commands + browser = twill.commands.get_browser() + browser.go('http://localhost:6543/') + self.assertEqual(browser.get_code(), 200) + self.assertEqual(browser.get_html(), 'global') + browser.go('http://localhost:6543/abc') + self.assertEqual(browser.get_code(), 200) + self.assertEqual(browser.get_html(), 'route') + browser.go('http://localhost:6543/def') + self.assertEqual(browser.get_code(), 200) + self.assertEqual(browser.get_html(), 'route2') + browser.go('http://localhost:6543/ghi') + self.assertEqual(browser.get_code(), 200) + self.assertEqual(browser.get_html(), 'global') + browser.go('http://localhost:6543/jkl') + self.assertEqual(browser.get_code(), 404) + class DummyContext(object): pass -- cgit v1.2.3