[Checkins] SVN: grokcore.layout/trunk/src/grokcore/layout/tests/ grokcore.layout should not depend on grokcore.formlib. Move the components that mix these all up to grok, fix up the remaining tests
Jan Wijbrand Kolman
cvs-admin at zope.org
Tue May 1 18:07:21 UTC 2012
Log message for revision 125538:
grokcore.layout should not depend on grokcore.formlib. Move the components that mix these all up to grok, fix up the remaining tests
Changed:
U grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml
U grokcore.layout/trunk/src/grokcore/layout/tests/layout/layoutlayers.py
U grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py
-=-
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml 2012-05-01 17:50:26 UTC (rev 125537)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/ftesting.zcml 2012-05-01 18:07:17 UTC (rev 125538)
@@ -1,20 +1,13 @@
<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:grok="http://namespaces.zope.org/grok">
-
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
<include package="zope.component" file="meta.zcml" />
<include package="zope.security" file="meta.zcml" />
-
<include package="zope.annotation" />
<include package="zope.security" />
- <include package="grokcore.layout" />
-
+ <include package="grokcore.layout" />
<grok:grok package=".layout" />
- <grok:grok package=".models" />
-
<!-- In order to test the errorviews that stem from zope.errorview. -->
<include package="zope.errorview.tests" file="ftesting.zcml"/>
-
<!-- We do not grok the other packages on purpose -->
-
</configure>
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/layout/layoutlayers.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/layout/layoutlayers.py 2012-05-01 17:50:26 UTC (rev 125537)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/layout/layoutlayers.py 2012-05-01 18:07:17 UTC (rev 125538)
@@ -68,8 +68,9 @@
return "B Layout"
-class MyView(Page):
+class MyViewA(Page):
grok.context(Interface)
+ grok.name('myview')
grok.layer(IDefaultLayer)
def render(self):
@@ -78,6 +79,7 @@
class MyViewB(Page):
grok.context(Interface)
+ grok.name('myview')
grok.layer(IAnotherLayer)
def render(self):
Modified: grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py
===================================================================
--- grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py 2012-05-01 17:50:26 UTC (rev 125537)
+++ grokcore.layout/trunk/src/grokcore/layout/tests/test_package.py 2012-05-01 18:07:17 UTC (rev 125538)
@@ -32,6 +32,6 @@
def test_suite():
suite = unittest.TestSuite()
- for name in ['layout', 'models', 'errors']:
+ for name in ['layout', 'errors']:
suite.addTest(suiteFromPackage(name))
return suite
More information about the checkins
mailing list