[Checkins] SVN: megrok.genshi/trunk/src/megrok/genshi/ Test for Markup.

Lennart Regebro regebro at gmail.com
Thu Oct 4 10:18:31 EDT 2007


Log message for revision 80612:
  Test for Markup.
  

Changed:
  U   megrok.genshi/trunk/src/megrok/genshi/components.py
  U   megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate.py
  U   megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate_templates/food.gmt

-=-
Modified: megrok.genshi/trunk/src/megrok/genshi/components.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-04 14:01:35 UTC (rev 80611)
+++ megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-04 14:18:30 UTC (rev 80612)
@@ -39,6 +39,9 @@
     def _factory_init(self, factory):
         pass
     
+    def getDefaultVariables(self):
+        return {}
+    
     def render_template(self, view):
         namespace = view.getDefaultVariables()
         namespace.update(view.getTemplateVariables())

Modified: megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate.py	2007-10-04 14:01:35 UTC (rev 80611)
+++ megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate.py	2007-10-04 14:18:30 UTC (rev 80612)
@@ -19,8 +19,10 @@
 
 class Food(grok.View):
     
+    text = "ME GROK EAT MAMMOTH!"
+    
     def me_do(self):
-        return "ME GROK EAT MAMMOTH!"
+        return self.text
 
 
 class GenshiTemplateTests(unittest.TestCase):
@@ -37,7 +39,6 @@
 </body>
 </html>""")
         
-    
     def test_view_access(self):
         # A template can access variables like "view" and it's 
         # methods and attributes.
@@ -51,12 +52,21 @@
 </html>""")
     
     def test_static(self):
+        # The URL of static resources can be gotten from the static variable.
         manfred = Mammoth()
         request = TestRequest()
         view = component.getMultiAdapter((manfred, request), name='static')
         html = view()
         self.assert_('@@/megrok.genshi.tests/test.css' in html)
 
+    def test_snippet(self):
+        manfred = Mammoth()
+        request = TestRequest()
+        view = component.getMultiAdapter((manfred, request), name='food')
+        view.text = "ME GROK EAT <MAMMOTH>!"
+        html = view()
+        self.assert_('ME GROK EAT <MAMMOTH>!' in html)
+        
 
 def test_suite():
     from megrok.genshi.tests import FunctionalLayer

Modified: megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate_templates/food.gmt
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate_templates/food.gmt	2007-10-04 14:01:35 UTC (rev 80611)
+++ megrok.genshi/trunk/src/megrok/genshi/tests/test_genshitemplate_templates/food.gmt	2007-10-04 14:18:30 UTC (rev 80612)
@@ -1,5 +1,5 @@
 <html>
 <body>
-${view.me_do()}
+${Markup(view.me_do())}
 </body>
 </html>



More information about the Checkins mailing list