Changeset 5740

Timestamp:

11/20/08 19:42:28 (2 months ago)

Author:

mramm

Message:

Added rendering tests, and some code to isolate the full stack config from the rest of the tests.

Added flash and flash_status to the tg namespace in all templates

Added the url function to all templates so we can easily use it to make links that still work when you mount an app outside the root of a site.

Files:

• trunk/tg/render.py (modified) (3 diffs)
• trunk/tg/tests/base.py (modified) (2 diffs)
• trunk/tg/test_stack/__init__.py (modified) (1 diff)
• trunk/tg/test_stack/test_config.py (modified) (1 diff)
• trunk/tg/test_stack/test_rendering.py (added)

trunk/tg/render.py

@@ -109 +109 @@
-        ipeek=ipeek, 
-        cycle=cycle, 
+        flash=tg.get_flash(),
+        flash_status=tg.get_status(),
-        quote_plus=quote_plus, 
-        checker=checker,
@@ -119 +121 @@
-        request = tg.request
-        )
+    
+    helpers = config.get('pylons.h') or config.get('pylons.helpers')
-        
-    helpers = config.get('pylons.h') or config.get('pylons.helpers')
-    
-    root_vars = Bunch(
-        c=tmpl_context,
@@ -128 +130 @@
-        request = request,
-        h = helpers,
+        url = tg.url,
-        helpers = helpers,
-        tg=tg_vars
-        )
+    #Allow users to provide a callable that defines extra vars to be 
+    #added to the template namespace
+    variable_provider = config.get('variable_provider', None)
+    if variable_provider:
+        root_vars.update(variable_provider())
-    return root_vars
-
-
-
+
-
-def render(template_vars, template_engine=None, template_name=None, **kwargs):

trunk/tg/tests/base.py

@@ -17 +17 @@
-from tg import tmpl_context
-from tg.util import Bunch
-from tg.configuration import AppConfig
-from pylons.util import ContextObj, PylonsContext
-from pylons.controllers.util import Request, Response
@@ -114 +113 @@
-        return self.app.post(url, extra_environ=self.environ, params=kargs)
-
-class TestConfig(AppConfig):
-
-    def __init__(self, folder, values=None):
-        AppConfig.__init__(self)
-        #First we setup some base values that we know will work
-        self.renderers = ['genshi'] 
-        self.render_functions = tg.util.Bunch()
-        self.package = tg.test_stack
-        self.default_renderer = 'genshi'
-        self.globals = self
-        self.helpers = {}
-        self.auth_backend = None
-        self.auto_reload_templates = False
-        self.use_legacy_renderer = True
-        self.serve_static = False
-        
-
-        #Then we overide those values with what was passed in
-        for key, value in values.items():
-            setattr(self, key, value)
-
-        
-        root = "."
-        test_base_path = os.path.join(root,'tg', 'test_stack',)
-        test_config_path = os.path.join(test_base_path, folder)
-        print test_config_path
-        self.paths=tg.util.Bunch(
-                    root=test_base_path,
-                    controllers=os.path.join(test_config_path, 'controllers'),
-                    static_files=os.path.join(test_config_path, 'public'),
-                    templates=[os.path.join(test_config_path, 'templates')]
-                    )
-
-    def setup_helpers_and_globals(self):
-        tg.config['pylons.app_globals'] = self.globals
-        tg.config['pylons.h'] = self.helpers

trunk/tg/test_stack/__init__.py

@@ +1 @@
+import os
+import tg
+from tg.configuration import AppConfig
-
+class TestConfig(AppConfig):
-
+    def __init__(self, folder, values=None):
+        AppConfig.__init__(self)
+        #First we setup some base values that we know will work
+        self.renderers = ['genshi'] 
+        self.render_functions = tg.util.Bunch()
+        self.package = tg.test_stack
+        self.default_renderer = 'genshi'
+        self.globals = self
+        self.helpers = {}
+        self.auth_backend = None
+        self.auto_reload_templates = False
+        self.use_legacy_renderer = True
+        self.serve_static = False
+        
-
+        #Then we overide those values with what was passed in
+        for key, value in values.items():
+            setattr(self, key, value)
+
+        
+        root = "."
+        test_base_path = os.path.join(root,'tg', 'test_stack',)
+        test_config_path = os.path.join(test_base_path, folder)
+        print test_config_path
+        self.paths=tg.util.Bunch(
+                    root=test_base_path,
+                    controllers=os.path.join(test_config_path, 'controllers'),
+                    static_files=os.path.join(test_config_path, 'public'),
+                    templates=[os.path.join(test_config_path, 'templates')]
+                    )
+
+    def setup_helpers_and_globals(self):
+        tg.config['pylons.app_globals'] = self.globals
+        tg.config['pylons.h'] = self.helpers
+
+def teardown():
+    global_config = {'debug': 'true', 
+                     'error_email_from': 'paste@localhost', 
+                     'smtp_server': 'localhost'}
+
+    base_config = TestConfig(folder = 'rendering', 
+                             values = {'use_sqlalchemy': False,
+                                       'pylons.helpers': tg.util.Bunch(),
+                                       'use_legacy_renderer': True,
+                                       }
+                             )
+    env_loader = base_config.make_load_environment()
+    app_maker = base_config.setup_tg_wsgi_app(env_loader)
+    app = app_maker(global_config, full_stack=True)
+

trunk/tg/test_stack/test_config.py

@@ -1 +1 @@
-import os
-s.base
+_stack
-from paste.fixture import TestApp
-