[Checkins] SVN: z3ext.preferences/trunk/ - Update tests setup
Nikolay Kim
fafhrd91 at gmail.com
Sun Jul 5 03:54:33 EDT 2009
Log message for revision 101560:
- Update tests setup
- Update tests for chameleon enabled setup
Changed:
U z3ext.preferences/trunk/CHANGES.txt
U z3ext.preferences/trunk/setup.py
U z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml
U z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt
U z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py
-=-
Modified: z3ext.preferences/trunk/CHANGES.txt
===================================================================
--- z3ext.preferences/trunk/CHANGES.txt 2009-07-05 07:51:41 UTC (rev 101559)
+++ z3ext.preferences/trunk/CHANGES.txt 2009-07-05 07:54:33 UTC (rev 101560)
@@ -2,6 +2,14 @@
CHANGES
=======
+1.4.9 (2009-07-05)
+------------------
+
+- Update tests setup
+
+- Update tests for chameleon enabled setup
+
+
1.4.8 (2009-06-22)
------------------
Modified: z3ext.preferences/trunk/setup.py
===================================================================
--- z3ext.preferences/trunk/setup.py 2009-07-05 07:51:41 UTC (rev 101559)
+++ z3ext.preferences/trunk/setup.py 2009-07-05 07:54:33 UTC (rev 101560)
@@ -84,6 +84,7 @@
'zope.testing',
'zope.testbrowser',
'zope.app.zcmlfiles',
+ 'z3ext.autoinclude',
]),
include_package_data = True,
zip_safe = False
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml 2009-07-05 07:51:41 UTC (rev 101559)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml 2009-07-05 07:54:33 UTC (rev 101560)
@@ -4,42 +4,13 @@
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="zope">
- <!-- This file is the equivalent of site.zcml and it is -->
- <!-- used for functional testing setup -->
+ <include package="z3ext.autoinclude" file="meta.zcml" />
+ <includeAllDependencies package="z3ext.preferences" extras="test" />
- <include package="zope.component" file="meta.zcml" />
- <include package="zope.securitypolicy" file="meta.zcml" />
- <include package="zope.viewlet" file="meta.zcml" />
- <include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.security" file="meta.zcml" />
- <include package="zope.app.pagetemplate" file="meta.zcml" />
-
- <include package="zope.securitypolicy" />
- <include package="zope.contentprovider" />
- <include package="zope.app.security" />
- <include package="zope.app.zcmlfiles" />
- <include package="zope.app.authentication" />
- <include package="zope.app.zcmlfiles" />
- <include package="zope.session" />
-
- <include package="z3c.form" file="meta.zcml" />
- <include package="z3c.form" />
- <include package="z3c.traverser" />
-
- <include package="z3ext.layout" file="meta.zcml" />
- <include package="z3ext.resource" file="meta.zcml" />
- <include package="z3ext.resourcepackage" file="meta.zcml" />
- <include package="z3ext.preferences" file="meta.zcml" />
- <include package="z3ext.layout" />
- <include package="z3ext.layoutform" />
- <include package="z3ext.resource" />
- <include package="z3ext.resourcepackage" />
- <include package="z3ext.statusmessage" />
- <include package="z3ext.preferences" />
<include package="z3ext.preferences.tests" />
<includeOverrides package="z3ext.preferences.tests" file="overrides.zcml" />
- <browser:defaultSkin name="DefaultSkin" />
+ <browser:defaultSkin name="DefaultSkin" />
<securityPolicy
component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt 2009-07-05 07:51:41 UTC (rev 101559)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt 2009-07-05 07:54:33 UTC (rev 101560)
@@ -66,9 +66,7 @@
>>> print user.contents
<html>
...
- ...<h1 class="z-prefs-title">Personal preferences</h1>
- <div class="z-page-description">This area allows you to change personal preferences.</div>
- <div class="z-prefs-content"><div class="z-form">
+ ...<h1 class="z-prefs-title">Personal preferences</h1><div class="z-page-description">This area allows you to change personal preferences.</div><div class="z-prefs-content"><div class="z-form">
<ul class="z-listing">
<li>
<div class="z-listing-details">
@@ -131,22 +129,17 @@
</div>
</div>
...
- ...<h1 class="z-prefs-title">Category</h1>
- <div class="z-page-description"></div>
- <div class="z-prefs-content"><div class="z-form z-form-edit"><form action="http://localhost/preferences/category/index.html"
- method="post" enctype="multipart/form-data"
- name="category" id="category">
- <h1 class="z-form-label">Category</h1>
- <div class="z-form-fieldset">
+ ...<h1 class="z-prefs-title">Category</h1><div class="z-page-description"></div><div class="z-prefs-content"><div class="z-form z-form-edit"><form action="http://localhost/preferences/category/index.html" method="post" enctype="multipart/form-data" name="category" id="category">
+ <h1 class="z-form-label">Category</h1><div class="z-form-fieldset">
<div class="z-form-field">
<label for="category-widgets-category" title="">Category</label>
<div class="z-form-help"></div>
<div><input type="text" id="category-widgets-category"
name="category.widgets.category"
class="text-widget textline-field" value="" />
+ </div>
</div>
</div>
- </div>
<div class="z-form-controls">
<span>
<hr />
@@ -155,17 +148,10 @@
class="z-form-savebutton button-field" value="Save" />
</span>
</div>
- </form>
- </div>
- <div class="z-form">
- <h2><a href="http://localhost/preferences/category/prefs1/">Preferences 1</a></h2>
- <div class="discreet"></div>
- <br />
- <h2><a href="http://localhost/preferences/category/prefs2/">Preferences 2</a></h2>
- <div class="discreet"></div>
- <br />
- </div>
- </div>
+ </form></div><div class="z-form">
+ <h2><a href="http://localhost/preferences/category/prefs1/">Preferences 1</a></h2><div class="discreet"></div><br />
+ <h2><a href="http://localhost/preferences/category/prefs2/">Preferences 2</a></h2><div class="discreet"></div><br />
+ </div></div></div>
...
</html>
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py 2009-07-05 07:51:41 UTC (rev 101559)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py 2009-07-05 07:54:33 UTC (rev 101560)
@@ -17,6 +17,7 @@
"""
import os.path, unittest, doctest
+from zope import component
from zope.component import testing
from zope.testing import doctestunit
from zope.app.testing import setup, functional
More information about the Checkins
mailing list