From c09800521cc9809f7ed7d15ea7e6f29079d89cab Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Thu, 27 Mar 2025 21:45:29 +0100 Subject: [PATCH] fix: if and for in 3 lines --- src/rougail/output_formatter/__init__.py | 2 ++ .../00_2default_calculated_multi/rougail/00-base.yml | 2 +- .../00_6choice_calculation/rougail/00-base.yml | 2 +- .../00_8calculation_information/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 8 ++++---- .../results/00_9default_integer/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../04_5disabled_calculation/rougail/00-base.yml | 4 ++-- .../rougail/00-base.yml | 4 ++-- .../rougail/00-base.yml | 4 ++-- .../rougail/00-base.yml | 8 ++++---- .../04_5hidden_calculation/rougail/00-base.yml | 4 ++-- .../04_5hidden_calculation2/rougail/00-base.yml | 4 ++-- .../rougail/00-base.yml | 4 ++-- tests/results/04_5validators/rougail/00-base.yml | 2 +- .../04_5validators_differ/rougail/00-base.yml | 2 +- .../results/04_5validators_multi/rougail/00-base.yml | 2 +- .../04_5validators_multi2/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 4 ++-- .../rougail/00-base.yml | 2 +- .../rougail/01-base.yml | 2 +- .../24_0family_hidden_condition/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 4 ++-- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 4 ++-- .../40_8calculation_boolean/rougail/00-base.yml | 12 ++++++------ .../rougail/00-base.yml | 2 +- .../40_8calculation_integer/rougail/00-base.yml | 12 ++++++++++-- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../60_1family_dynamic_jinja/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../60_5family_dynamic_calc2/rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- .../rougail/00-base.yml | 2 +- 53 files changed, 83 insertions(+), 73 deletions(-) diff --git a/src/rougail/output_formatter/__init__.py b/src/rougail/output_formatter/__init__.py index 9e73e23..2a89b9b 100644 --- a/src/rougail/output_formatter/__init__.py +++ b/src/rougail/output_formatter/__init__.py @@ -78,6 +78,8 @@ class RougailOutputFormatter: self.config = Config() self.config.profile = 'jinja' + self.config.line_break_after_multiline_tag = True + self.config.indent = " " self.original_yaml = RougailUpgrade(rougailconfig).run(filename) datas = RougailUpgrade(rougailconfig).run(filename) diff --git a/tests/results/00_2default_calculated_multi/rougail/00-base.yml b/tests/results/00_2default_calculated_multi/rougail/00-base.yml index c490f04..c08d67f 100644 --- a/tests/results/00_2default_calculated_multi/rougail/00-base.yml +++ b/tests/results/00_2default_calculated_multi/rougail/00-base.yml @@ -12,6 +12,6 @@ var2: default: jinja: |- {% for val in _.var1 %} - {{ val }} + {{ val }} {% endfor %} description: the value of _.var1 diff --git a/tests/results/00_6choice_calculation/rougail/00-base.yml b/tests/results/00_6choice_calculation/rougail/00-base.yml index 758070f..48b4ad2 100644 --- a/tests/results/00_6choice_calculation/rougail/00-base.yml +++ b/tests/results/00_6choice_calculation/rougail/00-base.yml @@ -6,7 +6,7 @@ var: choices: jinja: |- {% for n in trange(0, 10) %} - {{ n }} + {{ n }} {% endfor %} return_type: number description: choices is 0 to 9 diff --git a/tests/results/00_8calculation_information/rougail/00-base.yml b/tests/results/00_8calculation_information/rougail/00-base.yml index 225d67f..ca0460b 100644 --- a/tests/results/00_8calculation_information/rougail/00-base.yml +++ b/tests/results/00_8calculation_information/rougail/00-base.yml @@ -5,7 +5,7 @@ variable: description: a variable default: jinja: >- - {{test_information }} + {{ test_information }} description: get information test_information params: test_information: diff --git a/tests/results/00_9default_calculation_param_optional/rougail/00-base.yml b/tests/results/00_9default_calculation_param_optional/rougail/00-base.yml index ffbb6d5..820261b 100644 --- a/tests/results/00_9default_calculation_param_optional/rougail/00-base.yml +++ b/tests/results/00_9default_calculation_param_optional/rougail/00-base.yml @@ -6,13 +6,13 @@ var1: default: jinja: >- {% if var2 is defined %} - {{ var2 }} + {{ var2 }} {% elif var3 is defined %} - {{ var3 }} + {{ var3 }} {% elif var4 is defined %} - {{ var4 }} + {{ var4 }} {% else %} - {{ _.var2 }} + {{ _.var2 }} {% endif %} description: returns a value params: diff --git a/tests/results/00_9default_integer/rougail/00-base.yml b/tests/results/00_9default_integer/rougail/00-base.yml index f602044..e0e6ff3 100644 --- a/tests/results/00_9default_integer/rougail/00-base.yml +++ b/tests/results/00_9default_integer/rougail/00-base.yml @@ -6,7 +6,7 @@ var: choices: jinja: |- {% for item in trange(0, 10) %} - {{ item }} + {{ item }} {%- endfor %} return_type: number description: choice for 0 to 9 diff --git a/tests/results/01_8calculation_information_multi/rougail/00-base.yml b/tests/results/01_8calculation_information_multi/rougail/00-base.yml index 7087547..16cbee9 100644 --- a/tests/results/01_8calculation_information_multi/rougail/00-base.yml +++ b/tests/results/01_8calculation_information_multi/rougail/00-base.yml @@ -7,7 +7,7 @@ variable: default: jinja: |- {% for info in test_information %} - {{ info }} + {{ info }} {% endfor %} description: get information test_information params: diff --git a/tests/results/04_1auto_save_and_calculated_hidden/rougail/00-base.yml b/tests/results/04_1auto_save_and_calculated_hidden/rougail/00-base.yml index 74d1709..0ac60d7 100644 --- a/tests/results/04_1auto_save_and_calculated_hidden/rougail/00-base.yml +++ b/tests/results/04_1auto_save_and_calculated_hidden/rougail/00-base.yml @@ -13,6 +13,6 @@ var2: hidden: jinja: |- {% if _.var1 == "yes" %} - _.var1 is yes + _.var1 is yes {% endif %} description: only if the variable var1 has value "yes" diff --git a/tests/results/04_1default_calculation_hidden/rougail/00-base.yml b/tests/results/04_1default_calculation_hidden/rougail/00-base.yml index 483988c..6ec374c 100644 --- a/tests/results/04_1default_calculation_hidden/rougail/00-base.yml +++ b/tests/results/04_1default_calculation_hidden/rougail/00-base.yml @@ -14,5 +14,5 @@ var3: default: jinja: >- {% if _.var1 == 'value' or _.var2 == 'blah' %} - value + value {% endif %} diff --git a/tests/results/04_1default_calculation_hidden_2/rougail/00-base.yml b/tests/results/04_1default_calculation_hidden_2/rougail/00-base.yml index 3dfc658..49a32c6 100644 --- a/tests/results/04_1default_calculation_hidden_2/rougail/00-base.yml +++ b/tests/results/04_1default_calculation_hidden_2/rougail/00-base.yml @@ -14,5 +14,5 @@ var3: default: jinja: >- {% if _.var2 is propertyerror %} - value + value {% endif %} diff --git a/tests/results/04_5disabled_calculation/rougail/00-base.yml b/tests/results/04_5disabled_calculation/rougail/00-base.yml index c7ae8b5..39ad38c 100644 --- a/tests/results/04_5disabled_calculation/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation/rougail/00-base.yml @@ -8,7 +8,7 @@ variable1: disabled: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is egal to "yes" @@ -17,6 +17,6 @@ variable2: disabled: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is egal to "yes" diff --git a/tests/results/04_5disabled_calculation_default/rougail/00-base.yml b/tests/results/04_5disabled_calculation_default/rougail/00-base.yml index 3d4f451..e6dacef 100644 --- a/tests/results/04_5disabled_calculation_default/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_default/rougail/00-base.yml @@ -12,7 +12,7 @@ var1: disabled: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes @@ -25,6 +25,6 @@ var2: disabled: jinja: |- {% if rougail.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes diff --git a/tests/results/04_5disabled_calculation_multi/rougail/00-base.yml b/tests/results/04_5disabled_calculation_multi/rougail/00-base.yml index 3f001ac..6127572 100644 --- a/tests/results/04_5disabled_calculation_multi/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_multi/rougail/00-base.yml @@ -9,7 +9,7 @@ variable1: disabled: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is egal to "yes" @@ -19,6 +19,6 @@ variable2: disabled: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is egal to "yes" diff --git a/tests/results/04_5disabled_calculation_optional/rougail/00-base.yml b/tests/results/04_5disabled_calculation_optional/rougail/00-base.yml index ea606d3..898dfc7 100644 --- a/tests/results/04_5disabled_calculation_optional/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_optional/rougail/00-base.yml @@ -9,9 +9,9 @@ var1: hidden: jinja: |- {% if unknown is not defined %} - unknown is undefined + unknown is undefined {% elif unknown == "no" %} - unknown is no + unknown is no {% endif %} description: calculation from an unknown variable params: @@ -25,9 +25,9 @@ var2: hidden: jinja: |- {% if condition is not defined %} - condition is undefined + condition is undefined {% elif condition == "no" %} - condition is no + condition is no {% endif %} description: calculation from an condition variable params: diff --git a/tests/results/04_5hidden_calculation/rougail/00-base.yml b/tests/results/04_5hidden_calculation/rougail/00-base.yml index c0918d3..fffc089 100644 --- a/tests/results/04_5hidden_calculation/rougail/00-base.yml +++ b/tests/results/04_5hidden_calculation/rougail/00-base.yml @@ -9,7 +9,7 @@ var1: hidden: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes @@ -19,6 +19,6 @@ var2: hidden: jinja: |- {% if rougail.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes diff --git a/tests/results/04_5hidden_calculation2/rougail/00-base.yml b/tests/results/04_5hidden_calculation2/rougail/00-base.yml index 33ba95b..5cbf335 100644 --- a/tests/results/04_5hidden_calculation2/rougail/00-base.yml +++ b/tests/results/04_5hidden_calculation2/rougail/00-base.yml @@ -12,7 +12,7 @@ var1: hidden: jinja: |- {% if _.condition != "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes @@ -25,6 +25,6 @@ var2: hidden: jinja: |- {% if rougail.condition != "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes diff --git a/tests/results/04_5hidden_calculation_default_calculation/rougail/00-base.yml b/tests/results/04_5hidden_calculation_default_calculation/rougail/00-base.yml index 4eefd58..a49c9d2 100644 --- a/tests/results/04_5hidden_calculation_default_calculation/rougail/00-base.yml +++ b/tests/results/04_5hidden_calculation_default_calculation/rougail/00-base.yml @@ -12,7 +12,7 @@ var1: hidden: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes @@ -25,6 +25,6 @@ var2: hidden: jinja: |- {% if rougail.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes diff --git a/tests/results/04_5validators/rougail/00-base.yml b/tests/results/04_5validators/rougail/00-base.yml index dd9b34b..251d8b6 100644 --- a/tests/results/04_5validators/rougail/00-base.yml +++ b/tests/results/04_5validators/rougail/00-base.yml @@ -7,6 +7,6 @@ int: validators: - jinja: |- {% if _.int > 100 %} - value is too high + value is too high {% endif %} description: the max value is 100 diff --git a/tests/results/04_5validators_differ/rougail/00-base.yml b/tests/results/04_5validators_differ/rougail/00-base.yml index 0b03ee3..90456f5 100644 --- a/tests/results/04_5validators_differ/rougail/00-base.yml +++ b/tests/results/04_5validators_differ/rougail/00-base.yml @@ -8,7 +8,7 @@ var1: validators: - jinja: |- {% if _.var1 == _.var2 %} - var1 must be different than var2 + var1 must be different than var2 {% endif %} description: var1 must be different than var2 default: oui diff --git a/tests/results/04_5validators_multi/rougail/00-base.yml b/tests/results/04_5validators_multi/rougail/00-base.yml index 6ef2339..4951a60 100644 --- a/tests/results/04_5validators_multi/rougail/00-base.yml +++ b/tests/results/04_5validators_multi/rougail/00-base.yml @@ -6,7 +6,7 @@ var1: validators: - jinja: |- {% if _.var1 | length > 9 %} - length must be less than 10 + length must be less than 10 {% endif %} description: check length is less than 10 default: diff --git a/tests/results/04_5validators_multi2/rougail/00-base.yml b/tests/results/04_5validators_multi2/rougail/00-base.yml index 8225a78..31fbdd4 100644 --- a/tests/results/04_5validators_multi2/rougail/00-base.yml +++ b/tests/results/04_5validators_multi2/rougail/00-base.yml @@ -9,7 +9,7 @@ var1: validators: - jinja: |- {% if values | length > 2 %} - length must be less than 3 + length must be less than 3 {% endif %} description: check length is less than 3 params: diff --git a/tests/results/16_5redefine_remove_disable_calculation/rougail/00-base.yml b/tests/results/16_5redefine_remove_disable_calculation/rougail/00-base.yml index 15b08bd..74cb5f2 100644 --- a/tests/results/16_5redefine_remove_disable_calculation/rougail/00-base.yml +++ b/tests/results/16_5redefine_remove_disable_calculation/rougail/00-base.yml @@ -8,7 +8,7 @@ variable: disabled: jinja: |- {% if _.condition == "yes" %} - true + true {% else %} - false + false {% endif %} diff --git a/tests/results/20_0validators_differ_redefine/rougail/00-base.yml b/tests/results/20_0validators_differ_redefine/rougail/00-base.yml index eef705b..2dbd892 100644 --- a/tests/results/20_0validators_differ_redefine/rougail/00-base.yml +++ b/tests/results/20_0validators_differ_redefine/rougail/00-base.yml @@ -12,7 +12,7 @@ var3: validators: - jinja: |- {% if _.var3 == _.var1 %} - var3 must be different than var1 + var3 must be different than var1 {% endif %} description: var3 must be different than var1 default: yes diff --git a/tests/results/20_0validators_differ_redefine/rougail/01-base.yml b/tests/results/20_0validators_differ_redefine/rougail/01-base.yml index 45cd818..bbab07a 100644 --- a/tests/results/20_0validators_differ_redefine/rougail/01-base.yml +++ b/tests/results/20_0validators_differ_redefine/rougail/01-base.yml @@ -6,6 +6,6 @@ var3: validators: - jinja: |- {% if _.var3 == _.var2 %} - var3 must be different than var2 + var3 must be different than var2 {% endif %} description: var3 must be different than var2 diff --git a/tests/results/24_0family_hidden_condition/rougail/00-base.yml b/tests/results/24_0family_hidden_condition/rougail/00-base.yml index 0a9653b..37b5742 100644 --- a/tests/results/24_0family_hidden_condition/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition/rougail/00-base.yml @@ -8,7 +8,7 @@ family: hidden: jinja: |- {% if rougail.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes diff --git a/tests/results/24_0family_hidden_condition_boolean/rougail/00-base.yml b/tests/results/24_0family_hidden_condition_boolean/rougail/00-base.yml index 94be0f8..3e48668 100644 --- a/tests/results/24_0family_hidden_condition_boolean/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition_boolean/rougail/00-base.yml @@ -8,7 +8,7 @@ family: hidden: jinja: |- {% if not rougail.condition %} - condition is false + condition is false {% endif %} description: if not condition diff --git a/tests/results/24_0family_hidden_condition_sub_family/rougail/00-base.yml b/tests/results/24_0family_hidden_condition_sub_family/rougail/00-base.yml index 6276a83..edc517a 100644 --- a/tests/results/24_0family_hidden_condition_sub_family/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition_sub_family/rougail/00-base.yml @@ -8,7 +8,7 @@ family: hidden: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes diff --git a/tests/results/24_0family_hidden_condition_with_variable/rougail/00-base.yml b/tests/results/24_0family_hidden_condition_with_variable/rougail/00-base.yml index 7ae07e9..b81b110 100644 --- a/tests/results/24_0family_hidden_condition_with_variable/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition_with_variable/rougail/00-base.yml @@ -10,7 +10,7 @@ family: hidden: jinja: |- {% if not rougail.condition1 %} - condition1 is false + condition1 is false {% endif %} description: if condition1 is false @@ -20,6 +20,6 @@ family: hidden: jinja: |- {% if rougail.condition2 %} - condition2 is true + condition2 is true {% endif %} description: if condition2 is false diff --git a/tests/results/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml b/tests/results/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml index d1489e2..eec2337 100644 --- a/tests/results/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml @@ -8,7 +8,7 @@ family: hidden: jinja: |- {% if condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes params: diff --git a/tests/results/24_0family_mandatory_condition/rougail/00-base.yml b/tests/results/24_0family_mandatory_condition/rougail/00-base.yml index 3420711..44066bb 100644 --- a/tests/results/24_0family_mandatory_condition/rougail/00-base.yml +++ b/tests/results/24_0family_mandatory_condition/rougail/00-base.yml @@ -8,6 +8,6 @@ var: mandatory: jinja: |- {% if _.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: only if rougail.condition has the value "yes" diff --git a/tests/results/24_7validators_variable_optional/rougail/00-base.yml b/tests/results/24_7validators_variable_optional/rougail/00-base.yml index bdba789..b114f35 100644 --- a/tests/results/24_7validators_variable_optional/rougail/00-base.yml +++ b/tests/results/24_7validators_variable_optional/rougail/00-base.yml @@ -11,7 +11,7 @@ general: # a family validators: - jinja: |- {% if _.int == int2 %} - int and int2 must be different + int and int2 must be different {% endif %} description: int and int2 must be different params: @@ -20,7 +20,7 @@ general: # a family optional: true - jinja: |- {% if int3 is defined and _.int == int3 %} - int and int3 must be different + int and int3 must be different {% endif %} description: int and int3 must be different params: diff --git a/tests/results/40_8calculation_boolean/rougail/00-base.yml b/tests/results/40_8calculation_boolean/rougail/00-base.yml index f639683..7440dfb 100644 --- a/tests/results/40_8calculation_boolean/rougail/00-base.yml +++ b/tests/results/40_8calculation_boolean/rougail/00-base.yml @@ -10,10 +10,10 @@ multi1: default: jinja: |- {% if _.bool %} - True - False + True + False {% else %} - False + False {% endif %} description: a calculation @@ -24,9 +24,9 @@ multi2: default: jinja: |- {% if not _.bool %} - True - False + True + False {% else %} - False + False {% endif %} description: a calculation diff --git a/tests/results/40_8calculation_boolean_return_none/rougail/00-base.yml b/tests/results/40_8calculation_boolean_return_none/rougail/00-base.yml index 160a2ee..adadb8b 100644 --- a/tests/results/40_8calculation_boolean_return_none/rougail/00-base.yml +++ b/tests/results/40_8calculation_boolean_return_none/rougail/00-base.yml @@ -9,6 +9,6 @@ var2: default: jinja: >- {% if rougail.var1 == 'no' %} - false + false {% endif %} description: return false if the value of var1 is "no" diff --git a/tests/results/40_8calculation_integer/rougail/00-base.yml b/tests/results/40_8calculation_integer/rougail/00-base.yml index 2ef78fd..6af852e 100644 --- a/tests/results/40_8calculation_integer/rougail/00-base.yml +++ b/tests/results/40_8calculation_integer/rougail/00-base.yml @@ -8,7 +8,11 @@ int1: type: number default: jinja: >- - {% if rougail.bool %}1{% else %}2{% endif %} + {% if rougail.bool %} + 1 + {% else %} + 2 + {% endif %} description: if bool returns 1 otherwise return 2 int2: @@ -16,5 +20,9 @@ int2: type: number default: jinja: >- - {% if not rougail.bool %}3{% else %}4{% endif %} + {% if not rougail.bool %} + 3 + {% else %} + 4 + {% endif %} description: if bool returns 3 otherwise return 4 diff --git a/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml b/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml index 089e569..68a540e 100644 --- a/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml +++ b/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml @@ -15,6 +15,6 @@ leader: disabled: jinja: |- {% if rougail.condition == "yes" %} - condition is yes + condition is yes {% endif %} description: if condition is yes diff --git a/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml b/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml index cb21554..a2defb7 100644 --- a/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml +++ b/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml @@ -14,7 +14,7 @@ leader: hidden: jinja: |- {% if __.condition == "no" %} - condition is no + condition is no {% endif %} description: if condition is no diff --git a/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml b/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml index cb5acde..2782f92 100644 --- a/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml +++ b/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml @@ -14,6 +14,6 @@ leader: disabled: jinja: |- {% if __.condition == "yes" %} - disabled + disabled {% endif %} description: if condition is yes diff --git a/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml b/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml index 6fbf6ca..25d18c3 100644 --- a/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml +++ b/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml @@ -16,6 +16,6 @@ leader: disabled: jinja: |- {% if _.leader == "a" %} - the value of "leader" is "a" + the value of "leader" is "a" {% endif %} description: if the value of "leader" is "a" diff --git a/tests/results/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml index 5d7246f..27d219e 100644 --- a/tests/results/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml @@ -22,6 +22,6 @@ var2: default: jinja: >- {% if rougail.dyn1 is defined %} - {{ rougail.dyn1.var }} + {{ rougail.dyn1.var }} {% endif %} description: get the value of rougail.dyn1.var diff --git a/tests/results/60_1family_dynamic_jinja/rougail/00-base.yml b/tests/results/60_1family_dynamic_jinja/rougail/00-base.yml index 2a8f646..0dcfe16 100644 --- a/tests/results/60_1family_dynamic_jinja/rougail/00-base.yml +++ b/tests/results/60_1family_dynamic_jinja/rougail/00-base.yml @@ -10,7 +10,7 @@ dyn{{ identifier }}: dynamic: jinja: |- {% for val in _.var %} - {{ loop.index }} + {{ loop.index }} {% endfor %} description: index of suffix value diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml index ab60e0c..e2309f3 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml @@ -26,7 +26,7 @@ var2: default: jinja: >- {% if _.dynval1 is defined %} - {{ _.dynval1.family.var }} + {{ _.dynval1.family.var }} {% endif %} description: the value of var mandatory: false diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml b/tests/results/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml index 3933007..b544d21 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml @@ -23,7 +23,7 @@ var2: default: jinja: >- {% if _.dynval1 is defined %} - {{ _.dynval1.family.var }} + {{ _.dynval1.family.var }} {% endif %} description: the value of var mandatory: false diff --git a/tests/results/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml b/tests/results/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml index 7fd69cb..f135147 100644 --- a/tests/results/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml @@ -21,7 +21,7 @@ newvar: default: jinja: >- {% if _.dynval1 is defined %} - {{ _.dynval1.var }} + {{ _.dynval1.var }} {% endif %} description: the value of var mandatory: false diff --git a/tests/results/60_5family_dynamic_calc2/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc2/rougail/00-base.yml index 5494ad7..95bba25 100644 --- a/tests/results/60_5family_dynamic_calc2/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc2/rougail/00-base.yml @@ -12,7 +12,7 @@ dyn{{ identifier }}: hidden: jinja: |- {% if _.var2 == "no" %} - var2 is no + var2 is no {% endif %} description: if var2 is no dynamic: diff --git a/tests/results/60_5family_dynamic_calc2_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc2_empty/rougail/00-base.yml index e5c4040..06fbe08 100644 --- a/tests/results/60_5family_dynamic_calc2_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc2_empty/rougail/00-base.yml @@ -16,7 +16,7 @@ dyn{{ identifier }}: hidden: jinja: |- {% if _.var2 == "no" %} - var2 is no + var2 is no {% endif %} description: if var2 is no dynamic: diff --git a/tests/results/60_5family_dynamic_hidden_suffix/rougail/00-base.yml b/tests/results/60_5family_dynamic_hidden_suffix/rougail/00-base.yml index ee22705..5b3d6e9 100644 --- a/tests/results/60_5family_dynamic_hidden_suffix/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_hidden_suffix/rougail/00-base.yml @@ -6,7 +6,7 @@ dyn{{ identifier }}: hidden: jinja: |- {% if suffix == 'val2' %} - disabled + disabled {% endif %} description: if suffix == 'val2' params: diff --git a/tests/results/60_5family_dynamic_unknown_suffix/rougail/00-base.yml b/tests/results/60_5family_dynamic_unknown_suffix/rougail/00-base.yml index b06d055..bf2f7df 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_unknown_suffix/rougail/00-base.yml @@ -39,5 +39,5 @@ var: disabled: jinja: |- {% if 'val4' not in __.var %} - val4 is not a valid value + val4 is not a valid value {% endif %} diff --git a/tests/results/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml index 2e6f12d..1acc67b 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml @@ -38,5 +38,5 @@ var: disabled: jinja: |- {% if 'val4' not in __.var %} - val4 is not a valid value + val4 is not a valid value {% endif %} diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml index 5e83385..01189f0 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml @@ -22,7 +22,7 @@ var2: default: jinja: |- {%- for v in var %} - {{ v }} + {{ v }} {%- endfor -%} params: var: diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml index 8d898d8..ea57650 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml @@ -26,7 +26,7 @@ var2: default: jinja: |- {%- for v in var %} - {{ v }} + {{ v }} {%- endfor -%} params: var: diff --git a/tests/results/60_6family_dynamic_sub_dynamic/rougail/00-base.yml b/tests/results/60_6family_dynamic_sub_dynamic/rougail/00-base.yml index fe6e0fa..8e13f0d 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_sub_dynamic/rougail/00-base.yml @@ -16,7 +16,7 @@ dyn{{ identifier }}: default: jinja: |- {% for val in __.var %} - t{{ val }} + t{{ val }} {% endfor %} description: add 't' to each var value diff --git a/tests/results/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml b/tests/results/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml index 1b03386..d733518 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml @@ -17,7 +17,7 @@ dyn{{ identifier }}: default: jinja: |- {% for val in rougail.var %} - t{{ val }} + t{{ val }} {% endfor %} description: add 't' to each var value diff --git a/tests/results/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml b/tests/results/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml index d019953..794e715 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml @@ -20,7 +20,7 @@ dyn{{ identifier }}: default: jinja: |- {% for val in __.var %} - t{{ val }} + t{{ val }} {% endfor %} description: add 't' to each var value