Add extra tests regarding variable modification within a block

Author: jasmith-hs

src/test/java/com/hubspot/jinjava/EagerTest.java

@@ -1789,4 +1789,29 @@ public void itDoesNotDeferBlockWhenOnlyMiddleDefersSecondPass() {
       "does-not-defer-block-when-only-middle-defers/test.expected"
     );
   }
+
+  @Test
+  public void itPreservesBlocksForReconstructionOrder() {
+    expectedTemplateInterpreter.assertExpectedOutputNonIdempotent(
+      "preserves-blocks-for-reconstruction-order/test"
+    );
+  }
+
+  @Test
+  public void itPreservesBlocksForReconstructionOrderSecondPhase() {
+    localContext.put("deferred", "resolved");
+    String twoPhaseOutput = expectedTemplateInterpreter.assertExpectedOutput(
+      "preserves-blocks-for-reconstruction-order/test.expected"
+    );
+    expectedTemplateInterpreter.assertExpectedNonEagerOutput(
+      "preserves-blocks-for-reconstruction-order/test.expected"
+    );
+    // Sanity check
+    assertThat(twoPhaseOutput)
+      .isEqualToIgnoringWhitespace(
+        expectedTemplateInterpreter.renderTemplate(
+          "preserves-blocks-for-reconstruction-order/test"
+        )
+      );
+  }
 }

src/test/java/com/hubspot/jinjava/ExpectedTemplateInterpreter.java

@@ -49,8 +49,7 @@ private ExpectedTemplateInterpreter(
   }
 
   public String assertExpectedOutput(String name) {
-    String template = getFixtureTemplate(name);
-    String output = JinjavaInterpreter.getCurrent().render(template);
+    String output = renderTemplate(name);
     assertThat(JinjavaInterpreter.getCurrent().getContext().getDeferredNodes())
       .as("Ensure no deferred nodes were created")
       .isEmpty();
@@ -60,9 +59,13 @@ public String assertExpectedOutput(String name) {
     return output;
   }
 
-  public String assertExpectedOutputNonIdempotent(String name) {
+  public String renderTemplate(String name) {
     String template = getFixtureTemplate(name);
-    String output = JinjavaInterpreter.getCurrent().render(template);
+    return JinjavaInterpreter.getCurrent().render(template);
+  }
+
+  public String assertExpectedOutputNonIdempotent(String name) {
+    String output = renderTemplate(name);
     assertThat(JinjavaInterpreter.getCurrent().getContext().getDeferredNodes())
       .as("Ensure no deferred nodes were created")
       .isEmpty();

src/test/resources/eager/preserves-blocks-for-reconstruction-order/base.jinja

@@ -0,0 +1,13 @@
+{% if deferred %}
+{% set deferred_list = [] %}
+{% endif %}
+{% do deferred_list.append('Before block') %}
+Deferred list after block is: {{ deferred_list }}
+Deferred list after block should be: ['Before block']
+-----Pre-First-----
+{% block first -%}
+{%- endblock %}
+-----Post-First-----
+{% do deferred_list.append('After block') %}
+Deferred list after block is: {{ deferred_list }}
+Deferred list after block should be: ['Before block', 'After block']

src/test/resources/eager/preserves-blocks-for-reconstruction-order/test.expected.expected.jinja

@@ -0,0 +1,12 @@
+Deferred list after block is: ['Before block']
+Deferred list after block should be: ['Before block']
+-----Pre-First-----
+
+
+Deferred list inside of block is: ['Before block', 'After block', 'In child block']
+Deferred list inside of block should be: ['Before block', 'After block', 'In child block']
+
+-----Post-First-----
+
+Deferred list after block is: ['Before block', 'After block']
+Deferred list after block should be: ['Before block', 'After block']

src/test/resources/eager/preserves-blocks-for-reconstruction-order/test.expected.jinja

@@ -0,0 +1,19 @@
+{% set current_path = 'eager/preserves-blocks-for-reconstruction-order/base.jinja' %}\
+{% if deferred %}
+{% set deferred_list = [] %}
+{% endif %}
+{% do deferred_list.append('Before block') %}
+Deferred list after block is: {{ deferred_list }}
+Deferred list after block should be: ['Before block']
+-----Pre-First-----
+{% block first %}\
+{% set __temp_meta_current_path_1012932725__,current_path = current_path,'eager/preserves-blocks-for-reconstruction-order/test.jinja' %}
+{% do deferred_list.append('In child block') %}
+Deferred list inside of block is: {{ deferred_list }}
+Deferred list inside of block should be: ['Before block', 'After block', 'In child block']
+{% set current_path,__temp_meta_current_path_1012932725__ = __temp_meta_current_path_1012932725__,null %}\
+{% endblock first %}
+-----Post-First-----
+{% do deferred_list.append('After block') %}
+Deferred list after block is: {{ deferred_list }}
+Deferred list after block should be: ['Before block', 'After block']

src/test/resources/eager/preserves-blocks-for-reconstruction-order/test.jinja

@@ -0,0 +1,7 @@
+{% extends '../../eager/preserves-blocks-for-reconstruction-order/base.jinja' %}
+
+{% block first %}
+{% do deferred_list.append('In child block') %}
+Deferred list inside of block is: {{ deferred_list }}
+Deferred list inside of block should be: ['Before block', 'After block', 'In child block']
+{% endblock %}