[Checkins] SVN: z3ext.preferences/trunk/ update tests
Nikolay Kim
fafhrd91 at gmail.com
Tue Dec 22 18:55:28 EST 2009
Log message for revision 106977:
update tests
Changed:
U z3ext.preferences/trunk/buildout.cfg
U z3ext.preferences/trunk/setup.py
U z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml
U z3ext.preferences/trunk/src/z3ext/preferences/meta.zcml
U z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml
U z3ext.preferences/trunk/src/z3ext/preferences/tests/overrides.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/buildout.cfg
===================================================================
--- z3ext.preferences/trunk/buildout.cfg 2009-12-22 23:50:47 UTC (rev 106976)
+++ z3ext.preferences/trunk/buildout.cfg 2009-12-22 23:55:27 UTC (rev 106977)
@@ -27,17 +27,8 @@
<configure i18n_domain="zope"
xmlns:zcml="http://namespaces.zope.org/zcml"
xmlns:browser="http://namespaces.zope.org/browser">
- <include package="zope.component" 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.app.security" />
- <include package="zope.app.zcmlfiles" />
-
- <include package="z3c.autoinclude" file="meta.zcml" />
- <include package="z3ext.preferences" file="meta.zcml" />
- <include package="z3ext.preferences" />
+ <include package="z3ext.autoinclude" file="meta.zcml" />
+ <includeAllDependencies package="z3ext.preferences" extras="test" />
</configure>
[i18nall]
Modified: z3ext.preferences/trunk/setup.py
===================================================================
--- z3ext.preferences/trunk/setup.py 2009-12-22 23:50:47 UTC (rev 106976)
+++ z3ext.preferences/trunk/setup.py 2009-12-22 23:55:27 UTC (rev 106977)
@@ -81,7 +81,7 @@
extras_require = dict(test=['zope.app.testing',
'zope.testing',
'zope.testbrowser',
- 'zope.app.zcmlfiles',
+ 'zope.principalregistry',
'z3c.breadcrumb',
'z3ext.autoinclude',
'z3ext.authentication',
Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml 2009-12-22 23:50:47 UTC (rev 106976)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/configure.zcml 2009-12-22 23:55:27 UTC (rev 106977)
@@ -38,13 +38,6 @@
name="index.html"
for="..interfaces.IPreferenceGroup" />
- <browser:menuItem
- action="index.html"
- for="..interfaces.IPreferenceGroup"
- menu="zmi_views"
- title="View"
- permission="zope.Public" />
-
<!-- root preferences view -->
<z3ext:pagelet
for="..interfaces.IRootPreferences"
Modified: z3ext.preferences/trunk/src/z3ext/preferences/meta.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/meta.zcml 2009-12-22 23:50:47 UTC (rev 106976)
+++ z3ext.preferences/trunk/src/z3ext/preferences/meta.zcml 2009-12-22 23:55:27 UTC (rev 106977)
@@ -11,11 +11,11 @@
<meta:subdirective
name="allow"
- schema="zope.app.component.metadirectives.IAllowSubdirective" />
+ schema="zope.security.metadirectives.IAllowSubdirective" />
<meta:subdirective
name="require"
- schema="zope.app.component.metadirectives.IRequireSubdirective" />
+ schema="zope.security.metadirectives.IRequireSubdirective" />
</meta:complexDirective>
</meta:directives>
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml 2009-12-22 23:50:47 UTC (rev 106976)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/ftesting.zcml 2009-12-22 23:55:27 UTC (rev 106977)
@@ -4,6 +4,8 @@
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="zope">
+ <exclude package="zope.dublincore.browser" />
+
<include package="z3ext.autoinclude" file="meta.zcml" />
<includeAllDependencies package="z3ext.preferences" extras="test" />
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/overrides.zcml
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/overrides.zcml 2009-12-22 23:50:47 UTC (rev 106976)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/overrides.zcml 2009-12-22 23:55:27 UTC (rev 106977)
@@ -6,7 +6,7 @@
<z3ext:layout
name="portal"
title="Test layout"
- for="zope.app.component.interfaces.ISite"
+ for="zope.component.interfaces.ISite"
template="testlayout.pt" />
</configure>
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt 2009-12-22 23:50:47 UTC (rev 106976)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt 2009-12-22 23:55:27 UTC (rev 106977)
@@ -134,7 +134,6 @@
<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 id="category-widgets-category"
name="category.widgets.category"
@@ -153,8 +152,10 @@
</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 />
+ <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-12-22 23:50:47 UTC (rev 106976)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py 2009-12-22 23:55:27 UTC (rev 106977)
@@ -22,14 +22,14 @@
from zope.testing import doctestunit
from zope.app.testing import setup, functional
-from zope.app.rotterdam import Rotterdam
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.principalannotation.utility import PrincipalAnnotationUtility
from zope.principalannotation.interfaces import IPrincipalAnnotationUtility
from z3ext.layoutform.interfaces import ILayoutFormLayer
from z3ext.preferences.storage import principalRemovingHandler
-class IDefaultSkin(ILayoutFormLayer, Rotterdam):
+class IDefaultSkin(ILayoutFormLayer, IDefaultBrowserLayer):
""" skin """
More information about the checkins
mailing list