[Checkins] SVN: zope.app.form/trunk/ Define dummy standard_macros for test purposes. This reduces the test dependencies by zope.app.basicskin and zope.browserresource.

[Hanno Schlichting]

Log message for revision 106723:
  Define dummy standard_macros for test purposes. This reduces the test dependencies by zope.app.basicskin and zope.browserresource.
  

Changed:
  U   zope.app.form/trunk/CHANGES.txt
  U   zope.app.form/trunk/setup.py
  U   zope.app.form/trunk/src/zope/app/form/browser/macros.py
  U   zope.app.form/trunk/src/zope/app/form/ftesting.zcml
  A   zope.app.form/trunk/src/zope/app/form/tests/test_macros.pt

-=-
Modified: zope.app.form/trunk/CHANGES.txt
===================================================================
--- zope.app.form/trunk/CHANGES.txt	2009-12-17 23:00:04 UTC (rev 106722)
+++ zope.app.form/trunk/CHANGES.txt	2009-12-17 23:16:34 UTC (rev 106723)
@@ -5,6 +5,9 @@
 3.11.0 (unreleased)
 ===================
 
+- Define dummy standard_macros for test purposes. This reduces the test
+  dependencies by zope.app.basicskin and zope.browserresource.
+
 - Removed the zope.app.container and zope.app.publisher testing dependencies.
 
 - Refactored code to remove zope.app.component dependency.

Modified: zope.app.form/trunk/setup.py
===================================================================
--- zope.app.form/trunk/setup.py	2009-12-17 23:00:04 UTC (rev 106722)
+++ zope.app.form/trunk/setup.py	2009-12-17 23:16:34 UTC (rev 106723)
@@ -68,13 +68,11 @@
             'ZODB3',
             'zc.sourcefactory',
             'zope.browserpage',
-            'zope.browserresource',
             'zope.container',
             'zope.principalregistry',
             'zope.site',
             'zope.traversing',
             'zope.app.appsetup',
-            'zope.app.basicskin',
             'zope.app.publication',
             'zope.app.testing',
             ]},

Modified: zope.app.form/trunk/src/zope/app/form/browser/macros.py
===================================================================
--- zope.app.form/trunk/src/zope/app/form/browser/macros.py	2009-12-17 23:00:04 UTC (rev 106722)
+++ zope.app.form/trunk/src/zope/app/form/browser/macros.py	2009-12-17 23:16:34 UTC (rev 106723)
@@ -25,11 +25,15 @@
 class FormMacros(BrowserView):
     implements(IItemMapping)
 
-    macro_pages = ('widget_macros', 'addform_macros')
+    macro_pages = (
+        'view_macros',
+        'widget_macros',
+        'addform_macros',
+        )
     aliases = {
         'view': 'page',
         'dialog': 'page',
-        'addingdialog': 'page'
+        'addingdialog': 'page',
         }
 
     def __getitem__(self, key):

Modified: zope.app.form/trunk/src/zope/app/form/ftesting.zcml
===================================================================
--- zope.app.form/trunk/src/zope/app/form/ftesting.zcml	2009-12-17 23:00:04 UTC (rev 106722)
+++ zope.app.form/trunk/src/zope/app/form/ftesting.zcml	2009-12-17 23:16:34 UTC (rev 106723)
@@ -5,16 +5,13 @@
   package="zope.app.form"
   >
 
-  <include package="zope.browsermenu" file="meta.zcml" />
   <include package="zope.browserpage" file="meta.zcml" />
-  <include package="zope.browserresource" file="meta.zcml" />
   <include package="zope.component" file="meta.zcml" />
   <include package="zope.i18n" file="meta.zcml" />
   <include package="zope.security" file="meta.zcml" />
   <include package="zope.app.publication" file="meta.zcml" />
 
   <include package="zc.sourcefactory" />
-  <include package="zope.browsermenu" />
   <include package="zope.container" />
   <include package="zope.i18n" />
   <include package="zope.principalregistry" />
@@ -24,18 +21,24 @@
   <include package="zope.traversing" />
 
   <include package="zope.app.appsetup" />
-  <include package="zope.app.basicskin" />
   <include package="zope.app.publication" />
 
   <securityPolicy
       component="zope.security.simplepolicies.PermissiveSecurityPolicy" />
 
-  <browser:menu
-      id="zmi_views"
-      title="Views"
-      description="Menu for displaying alternate representations of an object"
-      />
+  <browser:page
+      name="standard_macros"
+      for="*"
+      class="zope.app.form.browser.macros.FormMacros"
+      allowed_interface="zope.interface.common.mapping.IItemMapping"
+      permission="zope.Public" />
 
+  <browser:page
+      name="view_macros"
+      for="*"
+      permission="zope.View"
+      template="tests/test_macros.pt" />
+
   <include package="zope.app.form.browser" file="meta.zcml" />
   <include package="zope.app.form.browser" />
   <include package="zope.app.form.browser.tests" file="i18n.zcml" />

Added: zope.app.form/trunk/src/zope/app/form/tests/test_macros.pt
===================================================================
--- zope.app.form/trunk/src/zope/app/form/tests/test_macros.pt	                        (rev 0)
+++ zope.app.form/trunk/src/zope/app/form/tests/test_macros.pt	2009-12-17 23:16:34 UTC (rev 106723)
@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html metal:define-macro="page">
+<head></head>
+<body>
+  <div metal:define-slot="body" />
+</body>
+</html>


Property changes on: zope.app.form/trunk/src/zope/app/form/tests/test_macros.pt
___________________________________________________________________
Added: svn:eol-style
   + native