Skip to content

Commit

Permalink
Remove test dependency on zope.app.zcmlfiles.
Browse files Browse the repository at this point in the history
  • Loading branch information
thefunny42 committed Apr 14, 2010
1 parent 6aa4143 commit 8a28edd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 39 deletions.
7 changes: 1 addition & 6 deletions setup.py
Expand Up @@ -27,13 +27,8 @@ def read(*rnames):
]

tests_require = [
'zope.app.authentication',
'zope.app.zcmlfiles',
'zope.app.wsgi [test]',
'zope.configuration',
'zope.container',
'zope.securitypolicy',
'zope.site',
'zope.testbrowser',
'zope.testing',
]

Expand Down
3 changes: 3 additions & 0 deletions src/grokcore/view/configure.zcml
@@ -1,7 +1,10 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:grok="http://namespaces.zope.org/grok">

<include package="zope.browserresource" />
<include package="zope.login" />

<!-- ZPT support -->
<grok:grok package=".templatereg" />
</configure>
38 changes: 5 additions & 33 deletions src/grokcore/view/ftesting.zcml
Expand Up @@ -3,48 +3,20 @@
xmlns:grok="http://namespaces.zope.org/grok"
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="grokcore.view"
package="grokcore.view"
>
package="grokcore.view">

<include package="zope.app.zcmlfiles" file="meta.zcml" />
<include package="zope.securitypolicy" file="meta.zcml" />
<include package="grokcore.view" file="meta.zcml" />
<include package="zope.app.wsgi" file="ftesting.zcml" />

<include package="zope.login" />
<include package="zope.app.zcmlfiles" />
<include package="zope.app.authentication" />
<include package="grokcore.view" file="meta.zcml" />
<include package="grokcore.view" />
<grok:grok package="grokcore.view.ftests" />

<include package="zope.app.wsgi" file="ftesting.zcml" />

<securityPolicy
component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
/>
<!-- We define our test permission here (don't have grok.Role) -->
<grok:grok package="grokcore.view.ftests" />

<browser:defaultView
for="grokcore.component.interfaces.IContext"
name="index"
/>

<unauthenticatedPrincipal
id="zope.anybody"
title="Unauthenticated User"
/>
<grant
permission="zope.View"
principal="zope.anybody"
/>

<principal
id="zope.mgr"
title="Manager"
login="mgr"
password="mgrpw"
/>

<role id="zope.Manager" title="Site Manager" />
<grantAll role="zope.Manager" />
<grant role="zope.Manager" principal="zope.mgr" />

</configure>

0 comments on commit 8a28edd

Please sign in to comment.