Skip to content

Commit 83ccaaf

Browse files
jasmith-hsjasmith-hs
committed
Update the text in the tests to be a bit more descriptive
1 parent 52f7fe5 commit 83ccaaf

9 files changed

Lines changed: 108 additions & 33 deletions

File tree

‎src/test/resources/eager/does-not-defer-block-when-only-middle-defers/middle.jinja‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ I WON'T SHOW UP
55
{% endblock %}
66

77
{% block second %}
8-
tracker_base is: {{ tracker_base }}? {{ tracker_base == '1_base' }}
9-
tracker_middle is: {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
10-
tracker_test is: {{ tracker_test }}? {{ tracker_test == 'resolved' }}
8+
tracker_base is '1_base': {{ tracker_base }}? {{ tracker_base == '1_base' }}
9+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
10+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}
1111
{% endblock %}
1212
Deferring tracker middle.{# This message will not show up in final output #}
1313
{% set tracker_middle = deferred %}

‎src/test/resources/eager/does-not-defer-block-when-only-middle-defers/test.expected.expected.jinja‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
-----Pre-First-----
22

3-
tracker_base is: 1_base? true
4-
tracker_middle is: resolved? true
5-
tracker_test is: resolved? true
3+
tracker_base is '1_base': 1_base? true
4+
tracker_middle is 'resolved': resolved? true
5+
tracker_test is 'resolved': resolved? true
66

77
-----Post-First-----
88
-----Pre-Second-----
99

10-
tracker_base is: 1_base? true
11-
tracker_middle is: resolved? true
12-
tracker_test is: resolved? true
10+
tracker_base is '1_base': 1_base? true
11+
tracker_middle is 'resolved': resolved? true
12+
tracker_test is 'resolved': resolved? true
1313

1414
-----Post-Second-----
1515
We aren't deferring tracker base.

‎src/test/resources/eager/does-not-defer-block-when-only-middle-defers/test.expected.jinja‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ Deferring tracker middle.
1717

1818
-----Pre-First-----
1919
{% set __temp_meta_current_path_1008935144__,current_path = current_path,'eager/does-not-defer-block-when-only-middle-defers/test.jinja' %}
20-
tracker_base is: 1_base? true
21-
tracker_middle is: {{ tracker_middle }}\
20+
tracker_base is '1_base': 1_base? true
21+
tracker_middle is 'resolved': {{ tracker_middle }}\
2222
? {{ tracker_middle == 'resolved' }}
23-
tracker_test is: {{ tracker_test }}\
23+
tracker_test is 'resolved': {{ tracker_test }}\
2424
? {{ tracker_test == 'resolved' }}
2525
{% set current_path,__temp_meta_current_path_1008935144__ = __temp_meta_current_path_1008935144__,null %}
2626
-----Post-First-----
2727
-----Pre-Second-----
2828
{% set __temp_meta_current_path_245328778__,current_path = current_path,'eager/does-not-defer-block-when-only-middle-defers/middle.jinja' %}
29-
tracker_base is: 1_base? true
30-
tracker_middle is: {{ tracker_middle }}\
29+
tracker_base is '1_base': 1_base? true
30+
tracker_middle is 'resolved': {{ tracker_middle }}\
3131
? {{ tracker_middle == 'resolved' }}
32-
tracker_test is: {{ tracker_test }}\
32+
tracker_test is 'resolved': {{ tracker_test }}\
3333
? {{ tracker_test == 'resolved' }}
3434
{% set current_path,__temp_meta_current_path_245328778__ = __temp_meta_current_path_245328778__,null %}
3535
-----Post-Second-----

‎src/test/resources/eager/does-not-defer-block-when-only-middle-defers/test.jinja‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
{% set tracker_test = '3_test' %}
44
{% block first %}
5-
tracker_base is: {{ tracker_base }}? {{ tracker_base == '1_base' }}
6-
tracker_middle is: {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
7-
tracker_test is: {{ tracker_test }}? {{ tracker_test == 'resolved' }}
5+
tracker_base is '1_base': {{ tracker_base }}? {{ tracker_base == '1_base' }}
6+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
7+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}
88
{% endblock %}
99
Deferring tracker test.{# This message will not show up in final output #}
1010
{% set tracker_test = deferred %}

‎src/test/resources/eager/handles-deferred-used-in-multiple-block-levels/base.jinja‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{% set tracker_base = '1_base' %}
2+
3+
tracker_base is '1_base': {{ tracker_base }}? {{ tracker_base == '1_base' }}
4+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
5+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}
6+
-----Pre-First-----
7+
{% block first -%}
8+
tracker_base is 'resolved': {{ tracker_base }}? {{ tracker_base == 'resolved' }}
9+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
10+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}
11+
{%- endblock %}
12+
-----Post-First-----
13+
tracker_base is '1_base': {{ tracker_base }}? {{ tracker_base == '1_base' }}
14+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
15+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}
16+
-----Pre-Second-----
17+
{% block second -%}
18+
tracker_base is 'resolved': {{ tracker_base }}? {{ tracker_base == 'resolved' }}
19+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
20+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}
21+
{%- endblock %}
22+
-----Post-Second-----
23+
Deferring tracker base.{# This message WILL show up in final output #}
24+
{% set tracker_base = deferred %}
25+
tracker_base is 'resolved': {{ tracker_base }}? {{ tracker_base == 'resolved' }}
26+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
27+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}

‎src/test/resources/eager/handles-deferred-used-in-multiple-block-levels/middle.jinja‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{% extends '../../eager/handles-deferred-used-in-multiple-block-levels/base.jinja' %}
2+
{% set tracker_middle = '2_middle' %}
3+
{% block first %}
4+
I WON'T SHOW UP
5+
{% endblock %}
6+
7+
{% block second %}
8+
tracker_base is 'resolved': {{ tracker_base }}? {{ tracker_base == 'resolved' }}
9+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
10+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}
11+
{% endblock %}
12+
Deferring tracker middle.{# This message will not show up in final output #}
13+
{% set tracker_middle = deferred %}

‎src/test/resources/eager/handles-deferred-used-in-multiple-block-levels/test.expected.expected.jinja‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
tracker_base is '1_base': 1_base? true
2+
tracker_middle is 'resolved': resolved? true
3+
tracker_test is 'resolved': resolved? true
4+
-----Pre-First-----
5+
6+
tracker_base is 'resolved': resolved? true
7+
tracker_middle is 'resolved': resolved? true
8+
tracker_test is 'resolved': resolved? true
9+
10+
-----Post-First-----
11+
tracker_base is '1_base': 1_base? true
12+
tracker_middle is 'resolved': resolved? true
13+
tracker_test is 'resolved': resolved? true
14+
-----Pre-Second-----
15+
16+
tracker_base is 'resolved': resolved? true
17+
tracker_middle is 'resolved': resolved? true
18+
tracker_test is 'resolved': resolved? true
19+
20+
-----Post-Second-----
21+
Deferring tracker base.
22+
23+
tracker_base is 'resolved': resolved? true
24+
tracker_middle is 'resolved': resolved? true
25+
tracker_test is 'resolved': resolved? true

‎src/test/resources/eager/handles-deferred-used-in-multiple-block-levels/test.expected.jinja‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,45 +14,45 @@ Deferring tracker middle.
1414
{% enddo %}\
1515
{# End Label: ignored_output_from_extends #}{% set current_path = 'eager/handles-deferred-used-in-multiple-block-levels/base.jinja' %}
1616

17-
tracker_base is: 1_base? true
18-
tracker_middle is: {{ tracker_middle }}\
17+
tracker_base is '1_base': 1_base? true
18+
tracker_middle is 'resolved': {{ tracker_middle }}\
1919
? {{ tracker_middle == 'resolved' }}
20-
tracker_test is: {{ tracker_test }}\
20+
tracker_test is 'resolved': {{ tracker_test }}\
2121
? {{ tracker_test == 'resolved' }}
2222
-----Pre-First-----
2323
{% block first %}\
2424
{% set __temp_meta_current_path_1057627035__,current_path = current_path,'eager/handles-deferred-used-in-multiple-block-levels/test.jinja' %}
25-
tracker_base is: {{ tracker_base }}\
25+
tracker_base is 'resolved': {{ tracker_base }}\
2626
? {{ tracker_base == 'resolved' }}
27-
tracker_middle is: {{ tracker_middle }}\
27+
tracker_middle is 'resolved': {{ tracker_middle }}\
2828
? {{ tracker_middle == 'resolved' }}
29-
tracker_test is: {{ tracker_test }}\
29+
tracker_test is 'resolved': {{ tracker_test }}\
3030
? {{ tracker_test == 'resolved' }}
3131
{% set current_path,__temp_meta_current_path_1057627035__ = __temp_meta_current_path_1057627035__,null %}\
3232
{% endblock first %}
3333
-----Post-First-----
34-
tracker_base is: 1_base? true
35-
tracker_middle is: {{ tracker_middle }}\
34+
tracker_base is '1_base': 1_base? true
35+
tracker_middle is 'resolved': {{ tracker_middle }}\
3636
? {{ tracker_middle == 'resolved' }}
37-
tracker_test is: {{ tracker_test }}\
37+
tracker_test is 'resolved': {{ tracker_test }}\
3838
? {{ tracker_test == 'resolved' }}
3939
-----Pre-Second-----
4040
{% block second %}\
4141
{% set __temp_meta_current_path_697061783__,current_path = current_path,'eager/handles-deferred-used-in-multiple-block-levels/middle.jinja' %}
42-
tracker_base is: {{ tracker_base }}\
42+
tracker_base is 'resolved': {{ tracker_base }}\
4343
? {{ tracker_base == 'resolved' }}
44-
tracker_middle is: {{ tracker_middle }}\
44+
tracker_middle is 'resolved': {{ tracker_middle }}\
4545
? {{ tracker_middle == 'resolved' }}
46-
tracker_test is: {{ tracker_test }}\
46+
tracker_test is 'resolved': {{ tracker_test }}\
4747
? {{ tracker_test == 'resolved' }}
4848
{% set current_path,__temp_meta_current_path_697061783__ = __temp_meta_current_path_697061783__,null %}\
4949
{% endblock second %}
5050
-----Post-Second-----
5151
Deferring tracker base.
5252
{% set tracker_base = deferred %}
53-
tracker_base is: {{ tracker_base }}\
53+
tracker_base is 'resolved': {{ tracker_base }}\
5454
? {{ tracker_base == 'resolved' }}
55-
tracker_middle is: {{ tracker_middle }}\
55+
tracker_middle is 'resolved': {{ tracker_middle }}\
5656
? {{ tracker_middle == 'resolved' }}
57-
tracker_test is: {{ tracker_test }}\
57+
tracker_test is 'resolved': {{ tracker_test }}\
5858
? {{ tracker_test == 'resolved' }}

‎src/test/resources/eager/handles-deferred-used-in-multiple-block-levels/test.jinja‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{% extends '../../eager/handles-deferred-used-in-multiple-block-levels/middle.jinja' %}
2+
3+
{% set tracker_test = '3_test' %}
4+
{% block first %}
5+
tracker_base is 'resolved': {{ tracker_base }}? {{ tracker_base == 'resolved' }}
6+
tracker_middle is 'resolved': {{ tracker_middle }}? {{ tracker_middle == 'resolved' }}
7+
tracker_test is 'resolved': {{ tracker_test }}? {{ tracker_test == 'resolved' }}
8+
{% endblock %}
9+
Deferring tracker test.{# This message will not show up in final output #}
10+
{% set tracker_test = deferred %}

0 commit comments

Comments
 (0)