[Checkins] SVN: Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/ Fixed adminmacros tests and cleaned up (no index but names instead).

Uli Fouquet uli at gnufix.de
Fri Aug 31 22:56:30 EDT 2007


Log message for revision 79410:
  Fixed adminmacros tests and cleaned up (no index but names instead).
  

Changed:
  U   Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/apps.py
  U   Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/macros.py
  U   Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/objectbrowser.py

-=-
Modified: Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/apps.py
===================================================================
--- Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/apps.py	2007-08-31 23:32:43 UTC (rev 79409)
+++ Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/apps.py	2007-09-01 02:56:29 UTC (rev 79410)
@@ -38,8 +38,9 @@
 
 We are able to add a mammoth manager...
 
-  >>> browser.getControl('Name your new app:', index=2).value = 'my-mammoth-manager'
-  >>> browser.getControl('Create', index=2).click()
+  >>> subform = browser.getForm(name='MammothManager')
+  >>> subform.getControl('Name your new app:').value = 'my-mammoth-manager'
+  >>> subform.getControl('Create').click()
 
   >>> print browser.contents
   <html xmlns="http://www.w3.org/1999/xhtml">

Modified: Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/macros.py
===================================================================
--- Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/macros.py	2007-08-31 23:32:43 UTC (rev 79409)
+++ Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/macros.py	2007-09-01 02:56:29 UTC (rev 79410)
@@ -24,15 +24,15 @@
 view is bound to ``Interface`` and can therefore be called with nearly
 every object as context.
 
-We create a non-GAIA object, a mammoth called 'manfred', which is hopefully defined in ftests/admin/apps.py.
+We create a non-GAIA object, a mammoth called 'manfred'.
 
-  >>> browser.getControl('Name your new app:',
-  ...    index=2).value = 'manfred'
-  >>> browser.getControl('Create', index=2).click()
+  >>> subform = browser.getForm(name='Mammoth')
+  >>> subform.getControl('Name your new app:').value = 'manfred'
+  >>> subform.getControl('Create').click()
 
 and call the macroview with it:
 
-  >>> browser.open('http://localhost/manfred/@@grokadminmacros')
+  >>> browser.open('http://localhost/manfred/@@externalview')
   >>> print browser.contents
   <html xmlns="http://www.w3.org/1999/xhtml">
   ...
@@ -51,3 +51,18 @@
 
 
 """
+import grok
+
+class Mammoth(grok.Application, grok.Container):
+    pass
+
+class ExternalView(grok.View):
+    """A view that calls grokadminmacros 'illegally'.
+    """
+    grok.context(Mammoth)
+
+externalview = grok.PageTemplate("""\
+<html metal:use-macro="context/@@grokadminmacros/gaia-page">
+</html>
+""")
+

Modified: Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/objectbrowser.py
===================================================================
--- Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/objectbrowser.py	2007-08-31 23:32:43 UTC (rev 79409)
+++ Sandbox/ulif/grok-adminui-experimental/src/grok/ftests/admin/objectbrowser.py	2007-09-01 02:56:29 UTC (rev 79410)
@@ -134,14 +134,3 @@
 
 
 """
-
-import grok
-
-class MammothManager(grok.Application, grok.Container):
-    """A mammoth manager"""
-    pass
-
-class Index(grok.View):#
-
-    def render(self):
-        return u"Let's manage some mammoths!"



More information about the Checkins mailing list