[Checkins] SVN: zc.testbrowser/trunk/ bugfixes, version bump in setup, see README.txt

[Bernd Dorn]

Log message for revision 82265:
  bugfixes, version bump in setup, see README.txt

Changed:
  U   zc.testbrowser/trunk/README.txt
  U   zc.testbrowser/trunk/setup.py
  U   zc.testbrowser/trunk/src/zc/testbrowser/README.txt
  A   zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.css
  A   zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.txt
  U   zc.testbrowser/trunk/src/zc/testbrowser/real.py
  U   zc.testbrowser/trunk/src/zc/testbrowser/tests.py

-=-
Modified: zc.testbrowser/trunk/README.txt
===================================================================
--- zc.testbrowser/trunk/README.txt	2007-12-12 07:56:06 UTC (rev 82264)
+++ zc.testbrowser/trunk/README.txt	2007-12-12 15:15:38 UTC (rev 82265)
@@ -16,6 +16,13 @@
 Changes
 =======
 
+After
+-----
+
+Bugfix: text content types where wrapped in html tags in testbrowser.real
+
+Bugfix: getLink did not wait until page is loaded in testbrowser.real
+
 1.0a1 (2007-09-28)
 ------------------
 

Modified: zc.testbrowser/trunk/setup.py
===================================================================
--- zc.testbrowser/trunk/setup.py	2007-12-12 07:56:06 UTC (rev 82264)
+++ zc.testbrowser/trunk/setup.py	2007-12-12 15:15:38 UTC (rev 82265)
@@ -22,7 +22,7 @@
 
 setup(
     name = 'zc.testbrowser',
-    version = '1.0a1',
+    version = '1.0a2',
     url = 'http://pypi.python.org/pypi/zc.testbrowser',
     license = 'ZPL 2.1',
     description = 'Programmable web browser for functional black-box testing '

Modified: zc.testbrowser/trunk/src/zc/testbrowser/README.txt
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/README.txt	2007-12-12 07:56:06 UTC (rev 82264)
+++ zc.testbrowser/trunk/src/zc/testbrowser/README.txt	2007-12-12 15:15:38 UTC (rev 82265)
@@ -56,7 +56,24 @@
     >>> browser.isHtml
     False
 
+Text types are also handled.
 
+    >>> browser.open('test.txt')
+    >>> browser.isHtml
+    False
+    >>> print browser.contents
+    Some text
+    >>> browser.open('test.css')
+    >>> browser.isHtml
+    False
+    >>> print browser.contents
+    * {
+        margin: 0;
+        padding: 0;
+    }
+
+
+
 HTML Page Title
 ----------------
 

Added: zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.css
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.css	                        (rev 0)
+++ zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.css	2007-12-12 15:15:38 UTC (rev 82265)
@@ -0,0 +1,4 @@
+* {
+    margin: 0;
+    padding: 0;
+}


Property changes on: zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.css
___________________________________________________________________
Name: svn:eol-style
   + native

Added: zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.txt
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.txt	                        (rev 0)
+++ zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.txt	2007-12-12 15:15:38 UTC (rev 82265)
@@ -0,0 +1 @@
+Some text


Property changes on: zc.testbrowser/trunk/src/zc/testbrowser/ftests/test.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-12-12 07:56:06 UTC (rev 82264)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py	2007-12-12 15:15:38 UTC (rev 82265)
@@ -11,7 +11,6 @@
 
 PROMPT = re.compile('repl\d?> ')
 
-
 class BrowserStateError(RuntimeError):
     pass
 
@@ -198,6 +197,10 @@
 
     @property
     def contents(self):
+        base, sub = self.execute('content.document.contentType').split('/')
+        if base == 'text' and 'html' not in sub:
+            return self.execute(
+                "content.document.getElementsByTagName('pre')[0].innerHTML")
         return self.execute('content.document.documentElement.innerHTML')
 
     @property
@@ -268,6 +271,7 @@
 
     def _follow_link(self, token):
         self.js.tb_follow_link(token)
+        self.waitForPageLoad()
 
     def getControlToken(self, label=None, name=None, index=None,
                         context_token=None, xpath=None):

Modified: zc.testbrowser/trunk/src/zc/testbrowser/tests.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/tests.py	2007-12-12 07:56:06 UTC (rev 82264)
+++ zc.testbrowser/trunk/src/zc/testbrowser/tests.py	2007-12-12 15:15:38 UTC (rev 82265)
@@ -60,6 +60,10 @@
             content_type = 'image/gif'
         elif self.path.endswith('.html'):
             content_type = 'text/html'
+        elif self.path.endswith('.txt'):
+            content_type = 'text/plain'
+        elif self.path.endswith('.css'):
+            content_type = 'text/css'
         else:
             self.send_response(500, 'unknown file type')