From e1c2ee1bc3e73b32db7f1b0f5e41b19da05b3829 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sun, 24 Jan 2010 09:00:47 +0000
Subject: Make sure global views don't match by default.

---
 repoze/bfg/tests/hybridapp/configure.zcml | 19 +++++++++++++++++++
 repoze/bfg/tests/hybridapp/views.py       |  4 ++++
 repoze/bfg/tests/test_integration.py      |  5 +++++
 3 files changed, 28 insertions(+)

diff --git a/repoze/bfg/tests/hybridapp/configure.zcml b/repoze/bfg/tests/hybridapp/configure.zcml
index 80e9e4fe5..56c6ea8db 100644
--- a/repoze/bfg/tests/hybridapp/configure.zcml
+++ b/repoze/bfg/tests/hybridapp/configure.zcml
@@ -14,6 +14,12 @@
      context="repoze.bfg.traversal.DefaultRootFactory"
      />
 
+  <view
+    name="global2"
+    view=".views.global2_view"
+    context="repoze.bfg.traversal.DefaultRootFactory"
+    />
+
   <route
      path="def"
      name="route2"
@@ -39,4 +45,17 @@
      name="route4"
      />
 
+  <!-- the global view should not be found for this route (/global2) -->
+  <route
+     path="mno/*traverse"
+     name="route5"
+     />
+
+  <!-- the global view should be found for this route (/global2) -->
+  <route
+     path="pqr/*traverse"
+     name="route6"
+     use_global_views="True"
+     />
+
 </configure>
diff --git a/repoze/bfg/tests/hybridapp/views.py b/repoze/bfg/tests/hybridapp/views.py
index 06423da83..7f60ddbfe 100644
--- a/repoze/bfg/tests/hybridapp/views.py
+++ b/repoze/bfg/tests/hybridapp/views.py
@@ -8,6 +8,10 @@ def global_view(request):
     """ """
     return Response('global')
 
+def global2_view(request):
+    """ """
+    return Response('global2')
+
 def route2_view(request):
     """ """
     return Response('route2')
diff --git a/repoze/bfg/tests/test_integration.py b/repoze/bfg/tests/test_integration.py
index 6affe24e1..c033f0e03 100644
--- a/repoze/bfg/tests/test_integration.py
+++ b/repoze/bfg/tests/test_integration.py
@@ -135,6 +135,11 @@ class TestHybridApp(TwillBase):
         self.assertEqual(browser.get_html(), 'global')
         browser.go('http://localhost:6543/jkl')
         self.assertEqual(browser.get_code(), 404)
+        browser.go('http://localhost:6543/mno/global2')
+        self.assertEqual(browser.get_code(), 404)
+        browser.go('http://localhost:6543/pqr/global2')
+        self.assertEqual(browser.get_code(), 200)
+        self.assertEqual(browser.get_html(), 'global2')
 
 class DummyContext(object):
     pass
-- 
cgit v1.2.3