[Checkins] SVN: megrok.chameleon/branches/sylvain-grokcore-view-only/ Fix broken tests when not using Grok as a requirement.

Sylvain Viollon sylvain at infrae.com
Thu Sep 17 10:44:10 EDT 2009


Log message for revision 104226:
  Fix broken tests when not using Grok as a requirement.
  
  

Changed:
  U   megrok.chameleon/branches/sylvain-grokcore-view-only/CHANGES.txt
  U   megrok.chameleon/branches/sylvain-grokcore-view-only/buildout.cfg
  U   megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/README.txt
  U   megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app.py
  U   megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app_templates/food.cpt
  U   megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/genshi_fixture/app.py

-=-
Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/CHANGES.txt
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/CHANGES.txt	2009-09-17 14:36:29 UTC (rev 104225)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/CHANGES.txt	2009-09-17 14:44:10 UTC (rev 104226)
@@ -4,6 +4,8 @@
 0.2 (unreleased)
 ================
 
+* Don't depend anymore on grok, but only grokcore.view.
+
 * Added support for `path()` and `exists()` in page templates. This
   was introduced from `z3c.pt`.
 

Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/buildout.cfg
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/buildout.cfg	2009-09-17 14:36:29 UTC (rev 104225)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/buildout.cfg	2009-09-17 14:44:10 UTC (rev 104226)
@@ -2,12 +2,13 @@
 develop = .
 parts = app data zopectl test
 find-links = http://download.zope.org/distribution/
-extends = http://grok.zope.org/releaseinfo/grok-1.0a1.cfg
+extends = http://grok.zope.org/releaseinfo/grok-1.0b1.cfg
 versions = versions
 newest = false
 
 [versions]
 zope.i18n = 3.5
+grokcore.view = 1.12.1
 
 [data]
 recipe = zc.recipe.filestorage
@@ -33,7 +34,7 @@
                        password="grok"
                        />
 
-            <!-- Replace the following directive if you don't want
+            <!-- Replace the following directive if you do not want
                  public access -->
             <grant permission="zope.View"
                    principal="zope.Anybody" />
@@ -57,5 +58,7 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = megrok.chameleon
+eggs =
+   megrok.chameleon
+   lxml
 defaults = ['--tests-pattern', '^f?tests$', '-v']

Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/README.txt
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/README.txt	2009-09-17 14:36:29 UTC (rev 104225)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/README.txt	2009-09-17 14:44:10 UTC (rev 104226)
@@ -103,13 +103,14 @@
     >>> print open(food_cpt, 'rb').read()
     <html>
     <body>
-    <span tal:define="foo 'a FOO'" />
+    <span tal:define="foo 'a FOO'">
     ${view.me_do()}
-    <span tal:replace="view.me_do()" />
+    <span tal:replace="structure view.me_do()" />
     CSS-URL: ${static['test.css']()}
     My context is: ${view.url(context)}
     ${foo}
     <span tal:replace="foo" />
+    </span>
     </body>
     </html>
 
@@ -119,13 +120,14 @@
     >>> print view()
     <html>
     <body>
-    <span />
+    <span>
+    &lt;ME GROK EAT MAMMOTH!&gt;
     <ME GROK EAT MAMMOTH!>
-    &lt;ME GROK EAT MAMMOTH!&gt;
     CSS-URL: http://127.0.0.1/@@/megrok.chameleon.tests.cpt_fixture/test.css
     My context is: http://127.0.0.1/manfred
     a FOO
     a FOO
+    </span>
     </body>
     </html>
 

Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app.py
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app.py	2009-09-17 14:36:29 UTC (rev 104225)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app.py	2009-09-17 14:44:10 UTC (rev 104226)
@@ -1,9 +1,14 @@
-import grokcore.view
+from grokcore.component.interfaces import IContext
+from zope.app.container.btree import BTreeContainer
+from zope.interface import implements
 from megrok.chameleon import components
 
-class Mammoth(grokcore.view.Context):
-    pass
+import grokcore.view
 
+
+class Mammoth(BTreeContainer):
+    implements(IContext)
+
 class CavePainting(grokcore.view.View):
     pass
 

Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app_templates/food.cpt
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app_templates/food.cpt	2009-09-17 14:36:29 UTC (rev 104225)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/cpt_fixture/app_templates/food.cpt	2009-09-17 14:44:10 UTC (rev 104226)
@@ -1,11 +1,12 @@
 <html>
 <body>
-<span tal:define="foo 'a FOO'" />
+<span tal:define="foo 'a FOO'">
 ${view.me_do()}
-<span tal:replace="view.me_do()" />
+<span tal:replace="structure view.me_do()" />
 CSS-URL: ${static['test.css']()}
 My context is: ${view.url(context)}
 ${foo}
 <span tal:replace="foo" />
+</span>
 </body>
 </html>

Modified: megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/genshi_fixture/app.py
===================================================================
--- megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/genshi_fixture/app.py	2009-09-17 14:36:29 UTC (rev 104225)
+++ megrok.chameleon/branches/sylvain-grokcore-view-only/src/megrok/chameleon/tests/genshi_fixture/app.py	2009-09-17 14:44:10 UTC (rev 104226)
@@ -1,9 +1,13 @@
-import grokcore.view
+from grokcore.component.interfaces import IContext
+from zope.app.container.btree import BTreeContainer
+from zope.interface import implements
 from megrok.chameleon import components
 
-class Mammoth(grokcore.view.Context):
-    pass
+import grokcore.view
 
+class Mammoth(BTreeContainer):
+    implements(IContext)
+
 class CavePainting(grokcore.view.View):
     pass
 



More information about the checkins mailing list