imported templates can see the current globals

_get_default_module takes an optional context to indicate that the
template is imported. If there are differences between the environment
and rendered template globals, a new module is used for the imported
template.

1 files changed, 19 insertions, 2 deletions

diff --git a/tests/test_imports.py b/tests/test_imports.py
index bb7400f8..054c9010 100644
--- a/tests/test_imports.py
+++ b/tests/test_imports.py
@@ -102,14 +102,31 @@ class TestImports:
         env = Environment(
             loader=DictLoader(
                 {
-                    "macros": "{% macro testing() %}foo: {{ foo }}{% endmacro %}",
-                    "test": "{% import 'macros' as m %}{{ m.testing() }}",
+                    "macros": "{% macro test() %}foo: {{ foo }}{% endmacro %}",
+                    "test": "{% import 'macros' as m %}{{ m.test() }}",
+                    "test1": "{% import 'macros' as m %}{{ m.test() }}",
                 }
             )
         )
         tmpl = env.get_template("test", globals={"foo": "bar"})
         assert tmpl.render() == "foo: bar"
 
+        tmpl = env.get_template("test1")
+        assert tmpl.render() == "foo: "
+
+    def test_import_with_globals_override(self, test_env):
+        env = Environment(
+            loader=DictLoader(
+                {
+                    "macros": "{% set foo = '42' %}{% macro test() %}"
+                    "foo: {{ foo }}{% endmacro %}",
+                    "test": "{% from 'macros' import test %}{{ test() }}",
+                }
+            )
+        )
+        tmpl = env.get_template("test", globals={"foo": "bar"})
+        assert tmpl.render() == "foo: 42"
+
     def test_from_import_with_globals(self, test_env):
         env = Environment(
             loader=DictLoader(