[Checkins] SVN: zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/ Fix documation issues and update copyright

Brian Sutherland jinty at web.de
Wed Dec 15 09:33:25 EST 2010


Log message for revision 118933:
  Fix documation issues and update copyright

Changed:
  U   zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/README.txt
  U   zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/cookies.txt
  U   zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/fixed-bugs.txt
  U   zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/wsgi.py

-=-
Modified: zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/README.txt
===================================================================
--- zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/README.txt	2010-12-15 14:01:38 UTC (rev 118932)
+++ zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/README.txt	2010-12-15 14:33:25 UTC (rev 118933)
@@ -5,24 +5,33 @@
 The ``zope.testbrowser.browser`` module exposes a ``Browser`` class that
 simulates a web browser similar to Mozilla Firefox or IE.
 
-    XXX: what to do with this?
-    XXX>>> from zope.testbrowser.browser import Browser
-    XXX>>> browser = Browser()
+    >>> from zope.testbrowser.browser import Browser as RealBrowser
+    >>> browser = RealBrowser()
 
 This version of the browser object can be used to access any web site just as
 you would do using a normal web browser.
 
+WSGI applications can also be tested directly when wrapped by WebTest:
+
+    >>> from zope.testbrowser.wsgi import Browser as WSGIBrowser
+    >>> from webtest import TestApp
+    >>> from wsgiref.simple_server import demo_app
+    >>> browser = WSGIBrowser(TestApp(demo_app), url='http://localhost/')
+    >>> print browser.contents
+    Hello world!
+    ...
+
 There is also a special version of the ``Browser`` class used to do functional
 testing of Zope 3 applications, it can be imported from
 ``zope.testbrowser.testing``:
 
-    XXX: what to do with this?
-    XXX>>> from zope.testbrowser.testing import Browser
+    >>> from zope.testbrowser.testing import Browser as TestingBrowser
+    >>> browser = TestingBrowser()
 
-    >>> browser = Browser()
+To allow this test to be run against different implementations, we will use a
+Browser object from the test globals. An initial page to load can be passed to
+the ``Browser`` constructor:
 
-An initial page to load can be passed to the ``Browser`` constructor:
-
     >>> browser = Browser('http://localhost/@@/testbrowser/simple.html')
     >>> browser.url
     'http://localhost/@@/testbrowser/simple.html'

Modified: zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/cookies.txt
===================================================================
--- zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/cookies.txt	2010-12-15 14:01:38 UTC (rev 118932)
+++ zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/cookies.txt	2010-12-15 14:33:25 UTC (rev 118933)
@@ -9,8 +9,6 @@
 setting, and deleting the cookies that the browser is remembering for the
 current url, or for an explicitly provided URL.
 
-    XXX: what to do with this?
-    XXX>>> from zope.testbrowser.testing import Browser
     >>> browser = Browser()
 
 Initially the browser does not point to a URL, and the cookies cannot be used.

Modified: zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/fixed-bugs.txt
===================================================================
--- zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/fixed-bugs.txt	2010-12-15 14:01:38 UTC (rev 118932)
+++ zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/fixed-bugs.txt	2010-12-15 14:33:25 UTC (rev 118933)
@@ -24,8 +24,6 @@
 
 The tests below failed before the change was put in place.
 
-    XXX: what to do with this?
-    XXX >>> from zope.testbrowser.testing import Browser
     >>> browser = Browser()
     >>> browser.addHeader('Cookie', 'test')
     >>> browser.open(u'http://localhost/@@/testbrowser/simple.html')

Modified: zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/wsgi.py
===================================================================
--- zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/wsgi.py	2010-12-15 14:01:38 UTC (rev 118932)
+++ zope.testbrowser/branches/jinty-webtest/src/zope/testbrowser/wsgi.py	2010-12-15 14:33:25 UTC (rev 118933)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Foundation and Contributors.
+# Copyright (c) 2010 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,



More information about the checkins mailing list