separate the test templates from the mainline stuff and tweak paths

Author: albu-diku

mig/assets/templates/.gitkeep

@@ -40,16 +40,20 @@
 else:
     from collections import ChainMap
 
-TEMPLATES_DIR = os.path.abspath(os.path.dirname(__file__))
+TEMPLATES_DIR = os.path.join(MIG_BASE, 'mig/assets/templates')
 TEMPLATES_CACHE_DIR = os.path.join(TEMPLATES_DIR, '__jinja__')
 
 _all_template_dirs = [
-    os.path.join(TEMPLATES_DIR, 'pages'),
-    os.path.join(TEMPLATES_DIR, 'partials')
+    TEMPLATES_DIR,
 ]
 _global_store = None
 
 
+def _clear_global_store():
+    global _global_store
+    _global_store = None
+
+
 def cache_dir():
     return TEMPLATES_CACHE_DIR
 
@@ -114,7 +118,7 @@ def grab_template(self, template_name, template_group, output_format, template_g
         return self._template_environment.get_template(template_fqname, globals=template_globals)
 
     def list_templates(self):
-        return self._template_environment.list_templates()
+        return [t for t in self._template_environment.list_templates() if t.endswith('.jinja')]
 
     def extract_variables(self, template_fqname):
         template = self._template_environment.get_template(template_fqname)
@@ -142,14 +146,14 @@ def populated(template_dirs, cache_dir=None, context=None):
         return store
 
 
-def init_global_templates(configuration):
+def init_global_templates(configuration, _templates_dirs=template_dirs):
     global _global_store
 
     if _global_store is not None:
         return _global_store
 
     _global_store = TemplateStore.populated(
-        template_dirs(),
+        _templates_dirs(),
         cache_dir=cache_dir(),
         context=_FormatContext(configuration)
     )

mig/shared/templates/__init__.py

@@ -1,36 +1,52 @@
+import os
 import shutil
 
-from tests.support import MigTestCase, testmain
+from tests.support import MigTestCase, testmain, \
+    MIG_BASE, TEST_DATA_DIR, TEST_OUTPUT_DIR
 
-from mig.shared.templates import TemplateStore, cache_dir, template_dirs
+from mig.shared.templates import TemplateStore, template_dirs, \
+    init_global_templates
 
+TEST_CACHE_DIR = os.path.join(TEST_OUTPUT_DIR, '__template_cache__')
+TEST_TMPL_DIR = os.path.join(TEST_DATA_DIR, 'templates')
 
-class TestMigSharedTemplates(MigTestCase):
-    @classmethod
-    def tearDownClass(cls):
-        shutil.rmtree(cache_dir(), ignore_errors=True)
+
+class TestMigSharedTemplates_instance(MigTestCase):
+    def after_each(self):
+        shutil.rmtree(TEST_CACHE_DIR, ignore_errors=True)
 
     def _provide_configuration(self):
         return 'testconfig'
 
     def test_the_creation_of_a_template_store(self):
-        store = TemplateStore.populated(template_dirs(), cache_dir=cache_dir())
+        store = TemplateStore.populated(TEST_TMPL_DIR, cache_dir=TEST_CACHE_DIR)
         self.assertIsInstance(store, TemplateStore)
 
     def test_a_listing_all_templates(self):
-        store = TemplateStore.populated(template_dirs(), cache_dir=cache_dir())
+        store = TemplateStore.populated(TEST_TMPL_DIR, cache_dir=TEST_CACHE_DIR)
         self.assertEqual(len(store.list_templates()), 2)
 
     def test_grab_template(self):
-        store = TemplateStore.populated(template_dirs(), cache_dir=cache_dir())
-        template = store.grab_template('other', 'partial', 'html')
+        store = TemplateStore.populated(TEST_TMPL_DIR, cache_dir=TEST_CACHE_DIR)
+        template = store.grab_template('other', 'test', 'html')
         pass
 
     def test_variables_for_remplate_ref(self):
-        store = TemplateStore.populated(template_dirs(), cache_dir=cache_dir())
-        template_vars = store.extract_variables('partial_something.html.jinja')
+        store = TemplateStore.populated(TEST_TMPL_DIR, cache_dir=TEST_CACHE_DIR)
+        template_vars = store.extract_variables('test_something.html.jinja')
         self.assertEqual(template_vars, set(['content']))
 
 
+class TestMigSharedTemplates_global(MigTestCase):
+    def _provide_configuration(self):
+        return 'testconfig'
+
+    def test_cache_location(self):
+        store = init_global_templates(self.configuration)
+
+        relative_cache_dir = os.path.relpath(store.cache_dir, MIG_BASE)
+        self.assertEqual(relative_cache_dir, 'mig/assets/templates/__jinja__')
+
+
 if __name__ == '__main__':
     testmain()

mig/shared/templates/partials/partial_other.html.jinja renamed to tests/data/templates/test_other.html.jinja

@@ -34,7 +34,7 @@
 import stat
 import sys
 
-from tests.support import PY2, MIG_BASE, MigTestCase, testmain, is_path_within
+from tests.support import PY2, MIG_BASE, TEST_DATA_DIR, MigTestCase, testmain
 from tests.support.snapshotsupp import SnapshotAssertMixin
 from tests.support.wsgisupp import prepare_wsgi, WsgiAssertMixin
 
@@ -49,6 +49,13 @@
     from html.parser import HTMLParser
 
 
+def _force_test_templates(configuration):
+    from mig.shared.templates import init_global_templates, _clear_global_store
+    _clear_global_store()
+    test_tmpl_dir = os.path.join(TEST_DATA_DIR, 'templates')
+    init_global_templates(configuration, _templates_dirs=lambda: [test_tmpl_dir])
+
+
 class DocumentBasicsHtmlParser(HTMLParser):
     """An HTML parser using builtin machinery to check basic html structure."""
 
@@ -313,13 +320,14 @@ def test_objects_with_type_template(self):
             {
                 'object_type': 'template',
                 'template_name': 'something',
-                'template_group': 'partial',
+                'template_group': 'test',
                 'template_args': {
                     'content': 'here!!'
                 }
             }
         ]
         self.fake_backend.set_response(output_objects, returnvalues.OK)
+        _force_test_templates(self.configuration)
 
         wsgi_result = migwsgi.application(
             *self.application_args,