Update tests to expect child scope reconstruction for partially

jasmith-hs · jasmith-hs · commit 47b4258ba4bc · 2024-09-11T11:03:29.000-04:00
evaluated macro output
diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunctionTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/eager/EagerMacroFunctionTest.java
@@ -111,7 +111,7 @@ public void itPartiallyEvaluatesMacroFunction() {
       .isInstanceOf(DeferredValueException.class);
     try (TemporaryValueClosable<Boolean> ignored = context.withPartialMacroEvaluation()) {
       assertThat(eagerMacroFunction.evaluate("Bar"))
-        .isEqualTo("It's: Bar, {{ deferred }}");
+        .isEqualTo("{% for __ignored__ in [0] %}It's: Bar, {{ deferred }}{% endfor %}");
     }
   }
 
diff --git a/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java b/src/test/java/com/hubspot/jinjava/lib/tag/eager/EagerImportTagTest.java
@@ -562,10 +562,16 @@ public void itHandlesVarFromImportedMacro() {
     );
     assertThat(result.trim())
       .isEqualTo(
-        "{% set var = [] %}{% do var.append('a' ~ deferred) %}" +
-        "a\n" +
+        "{% set var = [] %}" +
+        "{% set __macro_adjust_108896029_temp_variable_0__ %}" +
+        "{% do var.append('a' ~ deferred) %}" +
+        "a" +
+        "{% endset %}" +
+        "{{ __macro_adjust_108896029_temp_variable_0__ }}\n" +
+        "{% for __ignored__ in [0] %}" +
         "{% do var.append('b' ~ deferred) %}" +
-        "b\n" +
+        "b" +
+        "{% endfor %}\n" +
         "c{{ var }}"
       );
     context.put("deferred", "resolved");
diff --git a/src/test/resources/eager/defers-caller/test.expected.jinja b/src/test/resources/eager/defers-caller/test.expected.jinja
@@ -1,3 +1,4 @@
+{% for __ignored__ in [0] %}\
 Jack says:
 How do I get a {{ deferred }}\
-?
+?{% endfor %}
diff --git a/src/test/resources/eager/does-not-reconstruct-variable-in-wrong-scope/test.expected.jinja b/src/test/resources/eager/does-not-reconstruct-variable-in-wrong-scope/test.expected.jinja
@@ -12,8 +12,8 @@
 {% endset %}\
 {{ __macro_append_stuff_153654787_temp_variable_0__ }}
 {% endif %}
-
+{% for __ignored__ in [0] %}
 {% do my_list.append('d') %}
-
+{% endfor %}
 
 {{ my_list }}
diff --git a/src/test/resources/eager/handles-deferred-from-import-as/test.expected.jinja b/src/test/resources/eager/handles-deferred-from-import-as/test.expected.jinja
@@ -1,7 +1,9 @@
 {% set myname = deferred + 7 %}\
 {% do %}
 {% set bar = myname + 19 %}
-Hello {{ myname }}
+{% for __ignored__ in [0] %}\
+Hello {{ myname }}\
+{% endfor %}
 {% set from_bar = bar %}\
 {% enddo %}\
 from_foo: Hello {{ myname }}
diff --git a/src/test/resources/eager/handles-deferred-import-vars/test.expected.jinja b/src/test/resources/eager/handles-deferred-import-vars/test.expected.jinja
@@ -1,9 +1,13 @@
 {% set myname = deferred + 3 %}\
 {% do %}
 {% set bar = myname + 19 %}
-Hello {{ myname }}
+{% for __ignored__ in [0] %}\
+Hello {{ myname }}\
+{% endfor %}
 {% enddo %}\
-foo: Hello {{ myname }}
+foo: {% for __ignored__ in [0] %}\
+Hello {{ myname }}\
+{% endfor %}
 bar: {{ bar }}
 ---
 {% set myname = deferred + 7 %}\
@@ -13,7 +17,9 @@ bar: {{ bar }}
 {% for __ignored__ in [0] %}
 {% set bar = myname + 19 %}\
 {% do __temp_import_alias_902286926__.update({'bar': bar}) %}
-Hello {{ myname }}
+{% for __ignored__ in [0] %}\
+Hello {{ myname }}\
+{% endfor %}
 {% do __temp_import_alias_902286926__.update({'import_resource_path': 'eager/supplements/macro-and-set.jinja'}) %}\
 {% endfor %}\
 {% set simple = __temp_import_alias_902286926__ %}\

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public void itPartiallyEvaluatesMacroFunction() {`
`111`	`111`	`.isInstanceOf(DeferredValueException.class);`
`112`	`112`	`try (TemporaryValueClosable<Boolean> ignored = context.withPartialMacroEvaluation()) {`
`113`	`113`	`assertThat(eagerMacroFunction.evaluate("Bar"))`
`114`		`- .isEqualTo("It's: Bar, {{ deferred }}");`
	`114`	`+ .isEqualTo("{% for __ignored__ in [0] %}It's: Bar, {{ deferred }}{% endfor %}");`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`