[Checkins] SVN: Sandbox/darrylcousins/mars.layer/ Update
Darryl Cousins
darryl at darrylcousins.net.nz
Sun Feb 3 22:19:00 EST 2008
Log message for revision 83478:
Update
Changed:
U Sandbox/darrylcousins/mars.layer/buildout.cfg
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal-ftesting.zcml
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal.py
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet-ftesting.zcml
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet.py
U Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py
U Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt
-=-
Modified: Sandbox/darrylcousins/mars.layer/buildout.cfg
===================================================================
--- Sandbox/darrylcousins/mars.layer/buildout.cfg 2008-02-04 03:17:24 UTC (rev 83477)
+++ Sandbox/darrylcousins/mars.layer/buildout.cfg 2008-02-04 03:18:59 UTC (rev 83478)
@@ -2,7 +2,12 @@
develop = .
parts = test
extends = http://grok.zope.org/releaseinfo/grok-0.11.1.cfg
+versions = versions
+[versions]
+martian = 0.9.2
+z3c.layer = 0.2.1
+
[test]
recipe = zc.recipe.testrunner
eggs = mars.layer [test]
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal-ftesting.zcml
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal-ftesting.zcml 2008-02-04 03:17:24 UTC (rev 83477)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal-ftesting.zcml 2008-02-04 03:18:59 UTC (rev 83478)
@@ -1,12 +1,11 @@
<configure xmlns="http://namespaces.zope.org/zope"
- xmlns:meta="http://namespaces.zope.org/meta"
- xmlns:browser="http://namespaces.zope.org/browser"
+ xmlns:grok="http://namespaces.zope.org/grok"
i18n_domain="zope"
package="mars.layer.ftests">
<include package="grok" file="meta.zcml" />
- <include package="mars.layer" file="meta.zcml" />
+ <grok:grok package="mars.layer.ftests" />
<include package="z3c.layer.minimal.tests" file="ftesting.zcml" />
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal.py 2008-02-04 03:17:24 UTC (rev 83477)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/minimal.py 2008-02-04 03:18:59 UTC (rev 83478)
@@ -1,11 +1,6 @@
"""
- >>> from grok.testing import grok
- >>> grok('mars.layer.ftests.minimal')
-
>>> from zope.testbrowser.testing import Browser
- >>> browser = Browser()
- >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
>>> manager = Browser()
>>> manager.addHeader('Authorization', 'Basic mgr:mgrpw')
@@ -14,11 +9,14 @@
>>> manager.url
'http://localhost/++skin++MinimalTesting/page.html'
- >>> skinURL = 'http://localhost/++skin++myskin'
+ >>> skinURL = 'http://localhost/++skin++minskin'
Try opening page.htm which is registered in ftesting.zcml for
z3c.layer.IMinimalBrowserLayer.
+ >>> browser = Browser()
+ >>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+
>>> browser.open(skinURL + '/page.html')
>>> print browser.contents
<BLANKLINE>
@@ -46,8 +44,8 @@
# layer can be set on module level and will therefore be the layer
# for all views, template and macros in the module
-mars.layer.layer(IMyLayer)
+grok.layer(IMyLayer)
-class MySkin(mars.layer.Skin):
+class MinSkin(grok.Skin):
pass
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet-ftesting.zcml
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet-ftesting.zcml 2008-02-04 03:17:24 UTC (rev 83477)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet-ftesting.zcml 2008-02-04 03:18:59 UTC (rev 83478)
@@ -1,11 +1,10 @@
<configure xmlns="http://namespaces.zope.org/zope"
- xmlns:meta="http://namespaces.zope.org/meta"
- xmlns:browser="http://namespaces.zope.org/browser"
xmlns:grok="http://namespaces.zope.org/grok"
i18n_domain="zope"
package="mars.layer.ftests">
<include package="grok" file="meta.zcml" />
+
<grok:grok package="mars.layer.ftests" />
<include package="z3c.layer.pagelet.tests" file="ftesting.zcml" />
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet.py 2008-02-04 03:17:24 UTC (rev 83477)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/pagelet.py 2008-02-04 03:18:59 UTC (rev 83478)
@@ -1,8 +1,5 @@
"""
- >>> import grok.testing
- >>> grok.testing.grok(__name__)
-
>>> from zope.testbrowser.testing import Browser
>>> browser = Browser()
>>> browser.addHeader('Authorization', 'Basic mgr:mgrpw')
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py 2008-02-04 03:17:24 UTC (rev 83477)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/ftests/test_functional.py 2008-02-04 03:18:59 UTC (rev 83478)
@@ -1,31 +1,35 @@
+import os
import unittest
+
from zope.testing import doctest
-
-from zope.app.testing.functional import FunctionalTestSetup, getRootFolder
from zope.app.testing import functional
-functional.defineLayer('TestMinimalLayer', 'minimal-ftesting.zcml')
-functional.defineLayer('TestPageletLayer', 'pagelet-ftesting.zcml')
+minimal_zcml = os.path.join(os.path.dirname(__file__), 'minimal-ftesting.zcml')
+TestMinimalLayer = functional.ZCMLLayer(
+ minimal_zcml, __name__, 'TestMinimalLayer')
+pagelet_zcml = os.path.join(os.path.dirname(__file__), 'pagelet-ftesting.zcml')
+TestPageletLayer = functional.ZCMLLayer(
+ pagelet_zcml, __name__, 'TestPageletLayer')
+
optionflags = doctest.NORMALIZE_WHITESPACE + doctest.ELLIPSIS
-globs = dict(getRootFolder=getRootFolder)
def setUp(test):
- FunctionalTestSetup().setUp()
+ functional.FunctionalTestSetup().setUp()
def tearDown(test):
- FunctionalTestSetup().tearDown()
+ functional.FunctionalTestSetup().tearDown()
def test_suite():
suite = unittest.TestSuite()
dottedname = 'mars.layer.ftests.%s'
- #for name in ['minimal', 'directive']:
- # test = doctest.DocTestSuite(
- # dottedname % name, setUp=setUp, globs=globs,
- # tearDown=tearDown, optionflags=optionflags)
- # test.layer = TestMinimalLayer
- # suite.addTest(test)
+ for name in ['minimal', 'directive']:
+ test = doctest.DocTestSuite(
+ dottedname % name, setUp=setUp,
+ tearDown=tearDown, optionflags=optionflags)
+ test.layer = TestMinimalLayer
+ suite.addTest(test)
test = doctest.DocTestSuite(
- dottedname % 'pagelet', setUp=setUp, globs=globs,
+ dottedname % 'pagelet', setUp=setUp,
tearDown=tearDown, optionflags=optionflags)
test.layer = TestPageletLayer
suite.addTest(test)
Modified: Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt
===================================================================
--- Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt 2008-02-04 03:17:24 UTC (rev 83477)
+++ Sandbox/darrylcousins/mars.layer/src/mars/layer/layer.txt 2008-02-04 03:18:59 UTC (rev 83478)
@@ -17,10 +17,6 @@
>>> class MySkin(grok.Skin):
... grok.layer(IMyLayer)
- >>> #from mars.layer.meta import SkinGrokker
- >>> #SkinGrokker().grok('', MySkin, None, None, None)
- True
-
>>> from grok.meta import SkinGrokker
>>> SkinGrokker().grok('', MySkin, None, config)
True
More information about the Checkins
mailing list