Merge pull request #36 from JakobGM/forward-autoescape-from-jinja-env

Forward autoescape configuration of `jinja2.Environment` injected into `jinjax.Catalog`
jpsca · Jan 25, 2024 · 68620ce · 68620ce
2 parents f2d0c5e + 145e64a
commit 68620ce
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/jinjax/catalog.py b/src/jinjax/catalog.py
@@ -104,6 +104,7 @@ def __init__(
 
         if jinja_env:
             env.extensions.update(jinja_env.extensions)
+            env.autoescape = jinja_env.autoescape
             globals.update(jinja_env.globals)
             filters.update(jinja_env.filters)
             tests.update(jinja_env.tests)

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,5 +1,6 @@
-import pytest
+import jinja2
 import jinjax
+import pytest
 
 
 @pytest.fixture()
@@ -21,3 +22,11 @@ def catalog(folder):
     catalog = jinjax.Catalog(auto_reload=False)
     catalog.add_folder(folder)
     return catalog
+
+
+@pytest.fixture()
+def autoescaped_catalog(folder):
+    jinja_env = jinja2.Environment(autoescape=True)
+    catalog = jinjax.Catalog(auto_reload=False, jinja_env=jinja_env)
+    catalog.add_folder(folder)
+    return catalog
diff --git a/tests/test_render.py b/tests/test_render.py
@@ -470,7 +470,7 @@ def test_auto_reload(catalog, folder):
 """.strip() in html3
 
 
-def test_autoescape_doesnot_escape_subcomponents(catalog, folder):
+def test_autoescape_doesnot_escape_subcomponents(autoescaped_catalog, folder):
     """Issue https://github.com/jpsca/jinjax/issues/32"""
     (folder / "Page.jinja").write_text("""
 {#def message #}
@@ -485,8 +485,7 @@ def test_autoescape_doesnot_escape_subcomponents(catalog, folder):
 <p>foo bar</p>
 """)
 
-    catalog.jinja_env.autoescape = True
-    html = catalog.render("Page", message="<3")
+    html = autoescaped_catalog.render("Page", message="<3")
     assert html == """
 <html>
 <p>lorem ipsum</p>