[Checkins] SVN: zope.app.testing/trunk/ Removed test dependency on ``zope.app.zptpage``.
Michael Howitz
mh at gocept.com
Tue Sep 14 10:42:17 EDT 2010
Log message for revision 116404:
Removed test dependency on ``zope.app.zptpage``.
Changed:
U zope.app.testing/trunk/CHANGES.txt
U zope.app.testing/trunk/setup.py
U zope.app.testing/trunk/src/zope/app/testing/ftesting.zcml
U zope.app.testing/trunk/src/zope/app/testing/tests.py
-=-
Modified: zope.app.testing/trunk/CHANGES.txt
===================================================================
--- zope.app.testing/trunk/CHANGES.txt 2010-09-14 14:09:56 UTC (rev 116403)
+++ zope.app.testing/trunk/CHANGES.txt 2010-09-14 14:42:17 UTC (rev 116404)
@@ -9,8 +9,11 @@
others testing without a referer and 'localhost' is not a reasonable
default anyway.) This improves the situation for #98437
-- Make the xmlrpc code compatible with Python 2.7.
+- Made the xmlrpc code compatible with Python 2.7.
+- Removed test dependency on ``zope.app.zptpage``.
+
+
3.7.5 (2010-04-10)
------------------
Modified: zope.app.testing/trunk/setup.py
===================================================================
--- zope.app.testing/trunk/setup.py 2010-09-14 14:09:56 UTC (rev 116403)
+++ zope.app.testing/trunk/setup.py 2010-09-14 14:42:17 UTC (rev 116404)
@@ -57,7 +57,6 @@
package_dir = {'': 'src'},
namespace_packages=['zope', 'zope.app'],
extras_require=dict(test=['zope.app.authentication',
- 'zope.app.zptpage',
'zope.app.securitypolicy',
'zope.app.zcmlfiles',
'ZODB3',
Modified: zope.app.testing/trunk/src/zope/app/testing/ftesting.zcml
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/ftesting.zcml 2010-09-14 14:09:56 UTC (rev 116403)
+++ zope.app.testing/trunk/src/zope/app/testing/ftesting.zcml 2010-09-14 14:42:17 UTC (rev 116404)
@@ -11,7 +11,6 @@
<include package="zope.app.zcmlfiles" />
<include package="zope.app.authentication" />
- <include package="zope.app.zptpage"/>
<include package="zope.app.securitypolicy.browser.tests" file="functional.zcml" />
<include package="zope.app.securitypolicy" />
Modified: zope.app.testing/trunk/src/zope/app/testing/tests.py
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/tests.py 2010-09-14 14:09:56 UTC (rev 116403)
+++ zope.app.testing/trunk/src/zope/app/testing/tests.py 2010-09-14 14:42:17 UTC (rev 116404)
@@ -273,6 +273,23 @@
'HTTP_REFERER')
+class GetCookies(object):
+ """Get all cookies set."""
+
+ def __call__(self):
+ cookies = ['%s=%s'%(k, v)
+ for k, v in self.request.getCookies().items()]
+ cookies.sort()
+ return ';'.join(cookies)
+
+
+class SetCookies(object):
+ """Set a specific cookie."""
+
+ def __call__(self):
+ self.request.response.setCookie('bid', 'bval')
+
+
class CookieFunctionalTest(BrowserTestCase):
"""Functional tests should handle cookies like a web browser
@@ -286,41 +303,33 @@
"""
def setUp(self):
+ import zope.configuration.xmlconfig
+
super(CookieFunctionalTest, self).setUp()
self.assertEqual(
len(self.cookies.keys()), 0,
'cookies store should be empty')
- root = self.getRootFolder()
+ zope.configuration.xmlconfig.string(r'''
+ <configure xmlns="http://namespaces.zope.org/browser">
- from zope.app.zptpage.zptpage import ZPTPage
+ <include package="zope.browserpage" file="meta.zcml" />
- page = ZPTPage()
+ <page
+ name="getcookies"
+ for="*"
+ permission="zope.Public"
+ class="zope.app.testing.tests.GetCookies" />
- page.source = u'''<tal:tag tal:define="
- cookies python:['%s=%s'%(k,v) for k,v in request.getCookies().items()]"
- ><tal:tag tal:define="
- ignored python:cookies.sort()"
- /><span tal:replace="python:';'.join(cookies)" /></tal:tag>'''
+ <page
+ name="setcookie"
+ for="*"
+ permission="zope.Public"
+ class="zope.app.testing.tests.SetCookies" />
- root['getcookies'] = page
+ </configure>
+ ''')
- page = ZPTPage()
-
- page.source = u'''<tal:tag tal:define="
- ignored python:request.response.setCookie('bid','bval')" >
- <h1 tal:condition="ignored" />
- </tal:tag>'''
-
- root['setcookie'] = page
- transaction.commit()
-
- def tearDown(self):
- root = self.getRootFolder()
- del root['getcookies']
- del root['setcookie']
- super(CookieFunctionalTest, self).tearDown()
-
def testDefaultCookies(self):
# By default no cookies are set
response = self.publish('/')
More information about the checkins
mailing list