[Checkins] SVN: grokcore.view/branches/1.13/s Remove test dependency on zope.app.zcmlfiles.

Sylvain Viollon sylvain at infrae.com
Wed Apr 14 09:38:06 EDT 2010


Log message for revision 110882:
  Remove test dependency on zope.app.zcmlfiles.
  

Changed:
  U   grokcore.view/branches/1.13/setup.py
  U   grokcore.view/branches/1.13/src/grokcore/view/configure.zcml
  U   grokcore.view/branches/1.13/src/grokcore/view/ftesting.zcml

-=-
Modified: grokcore.view/branches/1.13/setup.py
===================================================================
--- grokcore.view/branches/1.13/setup.py	2010-04-14 13:37:22 UTC (rev 110881)
+++ grokcore.view/branches/1.13/setup.py	2010-04-14 13:38:06 UTC (rev 110882)
@@ -27,13 +27,8 @@
     ]
 
 tests_require = [
-    'zope.app.authentication',
-    'zope.app.zcmlfiles',
+    'zope.app.wsgi [test]',
     'zope.configuration',
-    'zope.container',
-    'zope.securitypolicy',
-    'zope.site',
-    'zope.testbrowser',
     'zope.testing',
     ]
 

Modified: grokcore.view/branches/1.13/src/grokcore/view/configure.zcml
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/configure.zcml	2010-04-14 13:37:22 UTC (rev 110881)
+++ grokcore.view/branches/1.13/src/grokcore/view/configure.zcml	2010-04-14 13:38:06 UTC (rev 110882)
@@ -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>

Modified: grokcore.view/branches/1.13/src/grokcore/view/ftesting.zcml
===================================================================
--- grokcore.view/branches/1.13/src/grokcore/view/ftesting.zcml	2010-04-14 13:37:22 UTC (rev 110881)
+++ grokcore.view/branches/1.13/src/grokcore/view/ftesting.zcml	2010-04-14 13:38:06 UTC (rev 110882)
@@ -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" />
+
+  <!-- We define our test permission here (don't have grok.Role) -->
   <grok:grok package="grokcore.view.ftests" />
 
-  <include package="zope.app.wsgi" file="ftesting.zcml" />
-
-  <securityPolicy
-      component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
-      />
-
   <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>



More information about the checkins mailing list