- change the way options are reported for single-unvalued checkbox co…

…ntrols - other minor tweaks
zopefoundation · Jul 27, 2005 · fd46269 · fd46269
1 parent 61d34d8
commit fd46269
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/testbrowser/README.txt b/testbrowser/README.txt
@@ -31,7 +31,7 @@ The contents of the current page are available:
       </body>
     </html>
 
-Making assertions about page contents are easy.
+Making assertions about page contents is easy.
 
     >>> 'Simple Page' in browser.contents
     True
@@ -488,7 +488,7 @@ There are various types of controls. They are demonstrated here.
     >>> ctrl.multiple
     True
     >>> ctrl.options
-    ['on']
+    [True]
 
   - Checkbox Control (Single-Valued, Valued)
 

diff --git a/testbrowser/browser.py b/testbrowser/browser.py
@@ -213,15 +213,15 @@ def value():
 
         def fget(self):
             value = self.mech_control.value
-            if self.type == 'checkbox' and self.options == ['on']:
+            if self.type == 'checkbox' and self.options == [True]:
                 value = bool(value)
             return value
 
         def fset(self, value):
             if self.mech_control.type == 'file':
                 self.mech_control.add_file(value)
                 return
-            if self.type == 'checkbox' and self.options == ['on']:
+            if self.type == 'checkbox' and self.options == [True]:
                 if value: 
                     value = ['on']
                 else:
@@ -235,6 +235,9 @@ def clear(self):
     @property
     def options(self):
         """See zope.app.testing.testbrowser.interfaces.IControl"""
+        if (self.type == 'checkbox'
+        and self.mech_control.possible_items() == ['on']):
+            return [True]
         try:
             return self.mech_control.possible_items()
         except:

diff --git a/testbrowser/ftests/simple.html b/testbrowser/ftests/simple.html
@@ -5,4 +5,4 @@
   <body>
     <h1>Simple Page</h1>
   </body>
-</html>
+</html>