[Checkins] SVN: zope.testbrowser/trunk/ Replaced the testing dependency on zope.app.zcmlfiles with explicit dependencies of a minimal set of packages.
Hanno Schlichting
hannosch at hannosch.eu
Sat Aug 29 09:38:38 EDT 2009
Log message for revision 103377:
Replaced the testing dependency on zope.app.zcmlfiles with explicit dependencies of a minimal set of packages.
Changed:
U zope.testbrowser/trunk/CHANGES.txt
U zope.testbrowser/trunk/setup.py
U zope.testbrowser/trunk/src/zope/testbrowser/README.txt
U zope.testbrowser/trunk/src/zope/testbrowser/cookies.txt
A zope.testbrowser/trunk/src/zope/testbrowser/ftests/cookies.html
U zope.testbrowser/trunk/src/zope/testbrowser/ftests/ftesting.zcml
U zope.testbrowser/trunk/src/zope/testbrowser/tests.py
-=-
Modified: zope.testbrowser/trunk/CHANGES.txt
===================================================================
--- zope.testbrowser/trunk/CHANGES.txt 2009-08-29 12:03:55 UTC (rev 103376)
+++ zope.testbrowser/trunk/CHANGES.txt 2009-08-29 13:38:38 UTC (rev 103377)
@@ -5,6 +5,9 @@
3.6.0a3 (unreleased)
--------------------
+- Replaced the testing dependency on zope.app.zcmlfiles with explicit
+ dependencies of a minimal set of packages.
+
- Remove unneeded zope.app.authentication from ftesting.zcml.
- Test dependency on zope.securitypolicy instead of its app variant.
Modified: zope.testbrowser/trunk/setup.py
===================================================================
--- zope.testbrowser/trunk/setup.py 2009-08-29 12:03:55 UTC (rev 103376)
+++ zope.testbrowser/trunk/setup.py 2009-08-29 13:38:38 UTC (rev 103377)
@@ -59,10 +59,19 @@
],
extras_require = {
'test': [
+ 'zope.component',
+ 'zope.container',
+ 'zope.principalregistry',
+ 'zope.publisher',
+ 'zope.security',
'zope.securitypolicy',
'zope.site',
+ 'zope.traversing',
+ 'zope.app.appsetup',
+ 'zope.app.principalannotation',
+ 'zope.app.publisher',
+ 'zope.app.publication',
'zope.app.testing',
- 'zope.app.zcmlfiles',
],
'zope-functional-testing': [
'zope.app.testing',
Modified: zope.testbrowser/trunk/src/zope/testbrowser/README.txt
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/README.txt 2009-08-29 12:03:55 UTC (rev 103376)
+++ zope.testbrowser/trunk/src/zope/testbrowser/README.txt 2009-08-29 13:38:38 UTC (rev 103377)
@@ -1312,7 +1312,7 @@
>>> browser.open('http://localhost/invalid')
Traceback (most recent call last):
...
- NotFound: Object: <zope.site.folder.Folder object at 0x8e00b6c>,
+ NotFound: Object: <zope.site.folder.Folder object at ...>,
name: u'invalid'
>>> browser.raiseHttpErrors = True
Modified: zope.testbrowser/trunk/src/zope/testbrowser/cookies.txt
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/cookies.txt 2009-08-29 12:03:55 UTC (rev 103376)
+++ zope.testbrowser/trunk/src/zope/testbrowser/cookies.txt 2009-08-29 13:38:38 UTC (rev 103377)
@@ -25,15 +25,15 @@
Once you send the browser to a URL, the cookies attribute can be used.
- >>> browser.open('http://localhost/')
+ >>> browser.open('http://localhost/@@/testbrowser/simple.html')
>>> len(browser.cookies)
0
>>> browser.cookies.keys()
[]
>>> browser.url
- 'http://localhost/'
+ 'http://localhost/@@/testbrowser/simple.html'
>>> browser.cookies.url
- 'http://localhost/'
+ 'http://localhost/@@/testbrowser/simple.html'
>>> import zope.testbrowser.interfaces
>>> from zope.interface.verify import verifyObject
>>> verifyObject(zope.testbrowser.interfaces.ICookies, browser.cookies)
@@ -49,9 +49,9 @@
>>> browser.cookies.forURL('http://www.example.com').url
'http://www.example.com'
>>> browser.url
- 'http://localhost/'
+ 'http://localhost/@@/testbrowser/simple.html'
>>> browser.cookies.url
- 'http://localhost/'
+ 'http://localhost/@@/testbrowser/simple.html'
Here, we use a view that will make the server set cookies with the
values we provide.
@@ -312,9 +312,9 @@
>>> sorted(browser.cookies.keys())
['foo', 'max', 'sha', 'va', 'wow']
- >>> import zope.app.folder.folder
- >>> getRootFolder()['inner'] = zope.app.folder.folder.Folder()
- >>> getRootFolder()['inner']['path'] = zope.app.folder.folder.Folder()
+ >>> import zope.site.folder
+ >>> getRootFolder()['inner'] = zope.site.folder.Folder()
+ >>> getRootFolder()['inner']['path'] = zope.site.folder.Folder()
>>> import transaction
>>> transaction.commit()
>>> browser.open('http://localhost/inner/get_cookie.html')
@@ -745,7 +745,7 @@
``change`` allows making changes to existing cookies. Changing expiration
is a good example.
- >>> browser.open("http://example.net")
+ >>> browser.open("http://localhost/@@/testbrowser/cookies.html")
>>> browser.cookies['foo'] = 'bar'
>>> browser.cookies.change('foo', expires=datetime.datetime(2021, 1, 1))
>>> browser.cookies.getinfo('foo')['expires']
@@ -760,7 +760,8 @@
>>> browser.cookies.getinfo('foo')['expires']
datetime.datetime(2020, 1, 1, 0, 0, tzinfo=<UTC>)
- >>> browser.cookies.forURL('http://example.net').change(
+ >>> browser.cookies.forURL(
+ ... 'http://localhost/@@/testbrowser/cookies.html').change(
... 'foo',
... expires=zope.testbrowser.cookies.expiration_string(
... datetime.datetime(2019, 1, 1)))
@@ -770,7 +771,7 @@
'bar'
>>> browser.cookies.change('foo', expires=datetime.datetime(1999, 1, 1))
>>> len(browser.cookies)
- 0
+ 4
While we are at it, it is worth noting that trying to create a cookie that has
already expired raises an error.
@@ -789,63 +790,23 @@
The ``clear`` method clears all of the cookies for the current page.
- >>> browser.open('https://dev.example.com/inner/path')
- >>> pprint.pprint(list(browser.cookies.iterinfo()))
- [{'comment': None,
- 'commenturl': None,
- 'domain': 'dev.example.com',
- 'expires': None,
- 'name': 'tweedle',
- 'path': '/inner/path',
- 'port': None,
- 'secure': False,
- 'value': 'dee'},
- {'comment': None,
- 'commenturl': None,
- 'domain': '.example.com',
- 'expires': None,
- 'name': 'boo',
- 'path': '/inner',
- 'port': None,
- 'secure': True,
- 'value': 'hoo'}]
- >>> browser.open('https://dev.example.com/inner')
+ >>> browser.open('http://localhost/@@/testbrowser/cookies.html')
>>> len(browser.cookies)
- 1
+ 4
>>> browser.cookies.clear()
>>> len(browser.cookies)
0
- >>> browser.open('https://dev.example.com/inner/path')
- >>> len(browser.cookies)
- 1
The ``clearAllSession`` method clears *all* session cookies (for all domains
and paths, not just the current URL), as if the browser had been restarted.
- >>> browser.open('http://localhost/inner/path')
- >>> len(browser.cookies)
- 8
- >>> len([info for info in browser.cookies.iterinfo()
- ... if info['expires'] is not None])
- 3
- >>> browser.open('https://dev.example.org/inner/path')
- >>> len(browser.cookies)
- 2
- >>> len([info for info in browser.cookies.iterinfo()
- ... if info['expires'] is not None])
- 0
>>> browser.cookies.clearAllSession()
>>> len(browser.cookies)
0
- >>> browser.open('http://localhost/inner/path')
- >>> len(browser.cookies)
- 3
The ``clearAll`` removes all cookies for the browser.
- >>> browser.open('http://example.org/')
>>> browser.cookies.clearAll()
- >>> browser.open('http://localhost/inner/path')
>>> len(browser.cookies)
0
Added: zope.testbrowser/trunk/src/zope/testbrowser/ftests/cookies.html
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/ftests/cookies.html (rev 0)
+++ zope.testbrowser/trunk/src/zope/testbrowser/ftests/cookies.html 2009-08-29 13:38:38 UTC (rev 103377)
@@ -0,0 +1,5 @@
+<html>
+ <body>
+ <h1>No Title</h1>
+ </body>
+</html>
\ No newline at end of file
Property changes on: zope.testbrowser/trunk/src/zope/testbrowser/ftests/cookies.html
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: zope.testbrowser/trunk/src/zope/testbrowser/ftests/ftesting.zcml
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/ftests/ftesting.zcml 2009-08-29 12:03:55 UTC (rev 103376)
+++ zope.testbrowser/trunk/src/zope/testbrowser/ftests/ftesting.zcml 2009-08-29 13:38:38 UTC (rev 103377)
@@ -1,15 +1,32 @@
<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- i18n_domain="zope"
- package="zope.testbrowser"
- >
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ i18n_domain="zope"
+ package="zope.testbrowser"
+ >
<!-- This file is used for functional testing setup -->
+ <include package="zope.component" file="meta.zcml" />
+ <include package="zope.principalregistry" file="meta.zcml" />
+ <include package="zope.security" file="meta.zcml" />
<include package="zope.securitypolicy" file="meta.zcml" />
- <include package="zope.app.zcmlfiles" />
+ <include package="zope.app.publisher" file="meta.zcml" />
+ <include package="zope.app.publication" file="meta.zcml" />
+ <include package="zope.component" />
+ <include package="zope.container" />
+ <include package="zope.principalregistry" />
+ <include package="zope.publisher" />
+ <include package="zope.security" />
+ <include package="zope.site" />
+ <include package="zope.traversing" />
+
+ <include package="zope.app.appsetup" />
+ <include package="zope.app.principalannotation" file="bootstrap.zcml" />
+ <include package="zope.app.publisher" />
+ <include package="zope.app.publication" />
+
<!-- Principals -->
<unauthenticatedPrincipal
Modified: zope.testbrowser/trunk/src/zope/testbrowser/tests.py
===================================================================
--- zope.testbrowser/trunk/src/zope/testbrowser/tests.py 2009-08-29 12:03:55 UTC (rev 103376)
+++ zope.testbrowser/trunk/src/zope/testbrowser/tests.py 2009-08-29 13:38:38 UTC (rev 103377)
@@ -383,8 +383,6 @@
(re.compile(r'Host: localhost'), 'Connection: close'),
(re.compile(r'Content-Type: '), 'Content-type: '),
(re.compile(r'Content-Disposition: '), 'Content-disposition: '),
- (re.compile(r'<zope.(app.folder|site).folder.Folder object at .*?>'),
- '<zope.site.folder.Folder object at 0x12345678>'),
])
TestBrowserLayer = zope.app.testing.functional.ZCMLLayer(
More information about the checkins
mailing list