[Zope-CVS] CVS: Products/Zelenium - CHANGES.txt:1.2 version.txt:1.2 zuite.py:1.2

[Tres Seaver]

Update of /cvs-repository/Products/Zelenium
In directory cvs.zope.org:/tmp/cvs-serv29370

Modified Files:
	CHANGES.txt version.txt zuite.py 
Log Message:


  - Allow test cases to be PageTemplates, as well as Files, to permit
    using the properties of the test suite for indirection.



=== Products/Zelenium/CHANGES.txt 1.1.1.1 => 1.2 ===
--- Products/Zelenium/CHANGES.txt:1.1.1.1	Fri Apr 15 14:48:44 2005
+++ Products/Zelenium/CHANGES.txt	Tue Apr 19 16:49:32 2005
@@ -1,5 +1,10 @@
 Zelenium Product Changelog
 
+  After Zelenium-0.1
+
+    - Allowed test cases to be PageTemplates, as well as Files, to permit
+      using the properties of the test suite for indirection.
+
   Zelenium-0.1 (2005/04/15)
 
     - CVS tag:  'Zelenium-0_1'


=== Products/Zelenium/version.txt 1.1.1.1 => 1.2 ===
--- Products/Zelenium/version.txt:1.1.1.1	Fri Apr 15 14:48:44 2005
+++ Products/Zelenium/version.txt	Tue Apr 19 16:49:32 2005
@@ -1 +1 @@
-Zelenium-0.1
+Zelenium-0.1+


=== Products/Zelenium/zuite.py 1.1.1.1 => 1.2 ===
--- Products/Zelenium/zuite.py:1.1.1.1	Fri Apr 15 14:48:44 2005
+++ Products/Zelenium/zuite.py	Tue Apr 19 16:49:32 2005
@@ -12,7 +12,6 @@
 from OFS.Image import File
 from OFS.OrderedFolder import OrderedFolder
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
 from permissions import ManageSeleniumTestCases
 from permissions import View
@@ -51,8 +50,8 @@
     A Zuite instance is an ordered folder, whose 'index_html' provides the
     typical "TestRunner.html" view from Selenium.  It generates the
     "TestSuite.html" view from its 'objectItems' list (which allows the
-    user to control ordering), selecting File objects whose names start
-    with 'test'.
+    user to control ordering), selecting File and PageTemplate objects
+    whose names start with 'test'.
     """
     meta_type = 'Zuite'
 
@@ -75,7 +74,7 @@
         """ Return a list of our contents which qualify as test cases.
         """
         return [ { 'id' : x[ 0 ], 'title' : x[ 1 ].title_or_id() }
-                 for x in self.objectItems( [ 'File' ] )
+                 for x in self.objectItems( [ 'File', 'Page Template' ] )
                       if x[ 0 ].startswith('test') ]
 
     def __getitem__( self, key, default=_MARKER ):
@@ -158,7 +157,9 @@
         test_cases = [ { 'id' :  self._getFilename( k )
                        , 'title' : v.title_or_id()
                        , 'data' : v.manage_FTPget()
-                       } for ( k, v ) in self.objectItems( [ 'File' ] ) ]
+                       } for ( k, v ) in self.objectItems( [ 'File'
+                                                           , 'Page Template'
+                                                           ] ) ]
 
         archive.writestr( 'testSuite.html'
                         , self.test_suite_html( test_cases=test_cases ) )