[z3-checkins] r5156 - in z3/Five/trunk: . tests tests/products/FiveTest

[faassen at codespeak.net]

Author: faassen
Date: Thu Jun 17 20:06:40 2004
New Revision: 5156

Modified:
   z3/Five/trunk/five.zcml
   z3/Five/trunk/tests/products/FiveTest/configure.zcml
   z3/Five/trunk/tests/test_five.py
Log:
Added a default traverser to make path based traversal work in ZPT.


Modified: z3/Five/trunk/five.zcml
==============================================================================
--- z3/Five/trunk/five.zcml	(original)
+++ z3/Five/trunk/five.zcml	Thu Jun 17 20:06:40 2004
@@ -4,6 +4,13 @@
   <include file="meta.zcml" />
   <include file="services.zcml" />
 
+  <!-- do 'traditional' traversing for ZPT by default -->
+
+  <adapter 
+      for="*"
+      factory="zope.app.traversing.adapters.DefaultTraversable"
+      provides="zope.app.traversing.interfaces.ITraversable" />
+
   <five:implements class="ZPublisher.HTTPRequest.HTTPRequest"
                    interface="zope.publisher.interfaces.browser.IBrowserRequest" />
 

Modified: z3/Five/trunk/tests/products/FiveTest/configure.zcml
==============================================================================
--- z3/Five/trunk/tests/products/FiveTest/configure.zcml	(original)
+++ z3/Five/trunk/tests/products/FiveTest/configure.zcml	Thu Jun 17 20:06:40 2004
@@ -32,4 +32,10 @@
     name="flamingo.html"
     />
 
+  <five:page
+    for=".interfaces.ISimpleContent"
+    template="flamingo2.pt"
+    name="flamingo2.html"
+    />
+
 </configure>

Modified: z3/Five/trunk/tests/test_five.py
==============================================================================
--- z3/Five/trunk/tests/test_five.py	(original)
+++ z3/Five/trunk/tests/test_five.py	Thu Jun 17 20:06:40 2004
@@ -41,37 +41,38 @@
         test = self.root.test
         view = self.root.unrestrictedTraverse('testoid/eagle.txt')
         self.assert_(isinstance(view, SimpleContentView))
-        data = view()
-        self.assertEquals('The eagle has landed', data)
+        self.assertEquals('The eagle has landed', view())
 
     def test_template_view(self):
         self.root.manage_addProduct['FiveTest'].manage_addSimpleContent(
             'testoid', 'Testoid')
         view = self.root.unrestrictedTraverse('testoid/falcon.html')
         self.assert_(isinstance(view, SimpleContentView))
-        data = view()
-        self.assertEquals(u'<p>The falcon has taken flight</p>\n', data)
+        self.assertEquals(u'<p>The falcon has taken flight</p>\n', view())
 
     def test_template_view_without_class(self):
         self.root.manage_addProduct['FiveTest'].manage_addSimpleContent(
             'testoid', 'Testoid')
         view = self.root.unrestrictedTraverse('testoid/owl.html')
-        data = view()
-        self.assertEquals(u'<p>2</p>\n', data)
+        self.assertEquals(u'<p>2</p>\n', view())
 
     def test_template_view_context(self):
         self.root.manage_addProduct['FiveTest'].manage_addSimpleContent(
             'testoid', 'Testoid')
         view = self.root.unrestrictedTraverse('testoid/flamingo.html')
-        data = view()
-        self.assertEquals(u'<p>Hello world</p>\n', data)
+        self.assertEquals(u'<p>Hello world</p>\n', view())
+
+    def test_template_view_context_path(self):
+        self.root.manage_addProduct['FiveTest'].manage_addSimpleContent(
+            'testoid', 'Testoid')
+        view = self.root.unrestrictedTraverse('testoid/flamingo2.html')
+        self.assertEquals(u'<p>Hello world</p>\n', view())
         
     def test_view_backwards_compatibility(self):
         self.root.manage_addProduct['FiveTest'].manage_addSimpleContent(
             'testoid', 'Testoid')
         old_view = self.root.unrestrictedTraverse('testoid/direct')
-        data = old_view()
-        self.assertEquals('Direct traversal worked', data)
+        self.assertEquals('Direct traversal worked', old_view())
         
 if __name__ == '__main__':
     framework()