[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/ ListControl.displayValue -> JSFunctionProxy

[Justas Sadzevičius]

Log message for revision 80237:
  ListControl.displayValue -> JSFunctionProxy
  

Changed:
  U   zc.testbrowser/trunk/src/zc/testbrowser/real.js
  U   zc.testbrowser/trunk/src/zc/testbrowser/real.py
  U   zc.testbrowser/trunk/src/zc/testbrowser/tests.py

-=-
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.js
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.js	2007-09-27 15:50:02 UTC (rev 80236)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.js	2007-09-27 15:58:00 UTC (rev 80237)
@@ -469,7 +469,7 @@
             }
         }
     }
-    return options.toSource();
+    return options;
 }
 
 function tb_find_listcontrol_elements(token) {

Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-09-27 15:50:02 UTC (rev 80236)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-09-27 15:58:00 UTC (rev 80237)
@@ -479,16 +479,13 @@
         # would be nice if ClientForm implemented for checkbox and radio.
         # attribute error for all others.
         def fget(self):
-            options = self.browser.execute(
-                'tb_get_listcontrol_displayValue(%r)' % self.token)
-            return [str(option) for option in simplejson.loads(options)]
+            return [str(option) for option in
+                    self.browser.js.tb_get_listcontrol_displayValue(self.token)]
 
         def fset(self, value):
             if self._browser_counter != self.browser._counter:
                 raise zc.testbrowser.interfaces.ExpiredError
-            self.browser.execute(
-                'tb_set_listcontrol_displayValue(%r, %s)' % (
-                self.token, simplejson.dumps(value)) )
+            self.browser.js.tb_set_listcontrol_displayValue(self.token, value)
         return property(fget, fset)
 
     @property

Modified: zc.testbrowser/trunk/src/zc/testbrowser/tests.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/tests.py	2007-09-27 15:50:02 UTC (rev 80236)
+++ zc.testbrowser/trunk/src/zc/testbrowser/tests.py	2007-09-27 15:58:00 UTC (rev 80237)
@@ -485,12 +485,17 @@
         checker=checker, setUp=setUpReal, tearDown=tearDownReal)
     real_readme.level = 3
 
+    real_js = doctest.DocFileSuite('javascript.txt', optionflags=flags,
+        checker=checker, setUp=setUpReal, tearDown=tearDownReal)
+    real_js.level = 3
+
     screen_shots = doctest.DocFileSuite('screen-shots.txt', optionflags=flags)
     screen_shots.level = 3
 
     this_file = doctest.DocTestSuite(checker=checker)
 
-    return unittest.TestSuite((this_file, readme, real_readme, screen_shots))
+    return unittest.TestSuite((this_file, readme, real_readme, screen_shots,
+                               real_js))
 
 if __name__ == '__main__':
     unittest.main(defaultTest='test_suite')