diff --git a/src/rougail/output_doc/collect.py b/src/rougail/output_doc/collect.py index a338a72a5..e1c84c821 100644 --- a/src/rougail/output_doc/collect.py +++ b/src/rougail/output_doc/collect.py @@ -404,7 +404,7 @@ class Collect(_ToString): if self.support_namespace and family.group_type() is groups.namespace: return "namespace" if family.isleadership(): - return "leadership" + return "sequence" if family.isdynamic(only_self=True): return "dynamic" return "family" @@ -421,7 +421,7 @@ class Collect(_ToString): informations = {} if not self._collect(family, informations, family_type=family_type): return False, [] - if family_type == "leadership": + if family_type == "sequence": informations.setdefault("help", []).append( _("This family contains lists of variable blocks") ) @@ -707,6 +707,7 @@ class Collect(_ToString): calculation_type = calculation.get("type") if ( calculation_type == "variable" + and isinstance(calculation["value"], dict) and calculation["value"]["type"] == "condition" ): condition = calculation["value"] diff --git a/src/rougail/output_doc/config.py b/src/rougail/output_doc/config.py index dddd8a79b..b2fc23947 100644 --- a/src/rougail/output_doc/config.py +++ b/src/rougail/output_doc/config.py @@ -173,7 +173,7 @@ doc: default_values: description: {_('Modify values to document all variables')} - help: {_('To document leadership or dynamic family variables, it is sometimes necessary to generate values, which can change the values in the configuration. Be careful if you reuse this configuration.')} + help: {_('To document sequence or dynamic family variables, it is sometimes necessary to generate values, which can change the values in the configuration. Be careful if you reuse this configuration.')} default: true true_color: @@ -186,7 +186,7 @@ doc: other_root_filenames: description: {_("The variables in this family are documented in another file")} help: {_("If you separate the variables into different files, the links between the variables will break. Therefore, you must define different filenames for the files containing these variables.")} - type: leadership + type: sequence root_path: description: {_("This file contains child variables of the family")} @@ -227,16 +227,15 @@ doc: description: {_("Environment variables prefix name")} alternative_name: dv default: ROUGAIL + mandatory: false validators: - jinja: |- {{{{ (_.environment_prefix | upper) != _.environment_prefix }}}} return_type: boolean description: {_("should only use uppercase characters")} disabled: - jinja: |- - {{{{ ___.main_namespace is not defined or ___.main_namespace == none or _.with_environment is false }}}} - return_type: boolean - description: {_('if "main_namespace" is not set or "_.with_environment" is false')} + variable: _.with_environment + when: false changelog: description: {_('Changelog documentation')} diff --git a/src/rougail/output_doc/example.py b/src/rougail/output_doc/example.py index 31b1ab585..0c7a13786 100644 --- a/src/rougail/output_doc/example.py +++ b/src/rougail/output_doc/example.py @@ -125,12 +125,9 @@ class Examples: # pylint: disable=no-member,too-few-public-methods def _set_mandatories(self, config): for calculated_too in [False, True]: - for option in config.value.mandatory(): + for option in config.value.mandatory(set_permissive=False): if not calculated_too: - try: - uncalculated = option.value.default(uncalculated=True) - except PropertiesOptionError: - continue + uncalculated = option.value.default(uncalculated=True) if isinstance(uncalculated, Calculation): continue self._set_value_example(option, self._get_an_example(option)) @@ -207,7 +204,7 @@ class Examples: # pylint: disable=no-member,too-few-public-methods for option, values in config.items(): if option.isoptiondescription(): if option.isleadership(): - subresults = self._example_parse_leadership(values, dump_type) + subresults = self._example_parse_sequence(values, dump_type) if subresults: name = option.name() results[name] = subresults @@ -244,18 +241,18 @@ class Examples: # pylint: disable=no-member,too-few-public-methods or (dump_type == 'default' and is_default) ) - def _example_parse_leadership(self, values, dump_type): - leadership_iter = iter(values.items()) - leader, leader_values = next(leadership_iter) + def _example_parse_sequence(self, values, dump_type): + sequence_iter = iter(values.items()) + leader, leader_values = next(sequence_iter) if not self._is_valid_owner(leader, dump_type): return None - leadership = [CommentedMap() for idx in range(len(leader_values))] + sequence = [CommentedMap() for idx in range(len(leader_values))] for idx, value in enumerate(leader_values): - self._set_example_value(leadership[idx], leader, value, dump_type) - for option, value in leadership_iter: + self._set_example_value(sequence[idx], leader, value, dump_type) + for option, value in sequence_iter: idx = option.index() - self._set_example_value(leadership[idx], option, value, dump_type) - return leadership + self._set_example_value(sequence[idx], option, value, dump_type) + return sequence def _set_description(self, results, name, option): if not self.comment_examples or option.information.get( diff --git a/src/rougail/output_doc/utils.py b/src/rougail/output_doc/utils.py index 003685833..eb51890a2 100644 --- a/src/rougail/output_doc/utils.py +++ b/src/rougail/output_doc/utils.py @@ -276,11 +276,10 @@ class CommonFormatter: if self.with_environment and not gen_argument_name: raise Exception("please install tiramisu_cmdline_parser") if not self.rougailconfig["main_namespace"] and self.with_environment: - if self.support_namespace: - self.prefix = "" - else: + environment_prefix = self.rougailconfig["doc.tabulars.environment_prefix"] + if environment_prefix: self.prefix = ( - self.rougailconfig["doc.tabulars.environment_prefix"] + "_" + environment_prefix + "_" ) self.with_family = not self.rougailconfig["doc.tabulars.without_family"] self.other_root_filenames = dict(self.rougailconfig["doc.other_root_filenames"].items()) diff --git a/tests/force_optional.adoc b/tests/force_optional.adoc index 4c248dd51..fbd13ea31 100644 --- a/tests/force_optional.adoc +++ b/tests/force_optional.adoc @@ -17,12 +17,12 @@ `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[choice]` `mandatory` | My var6. + **Choices**: -* +* | **var7** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[choice]` `mandatory` | My var7. + **Choices**: -* +* | **var8** + `https://rougail.readthedocs.io/en/latest/variable.html#variables-types[choice]` `mandatory` | My var8. + **Choices**: values of "a.unknown.variable". diff --git a/tests/results/test/40_0leadership.json b/tests/results/test/40_0leadership.json index 5df64f007..35686f2bb 100644 --- a/tests/results/test/40_0leadership.json +++ b/tests/results/test/40_0leadership.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_0leadership_diff_name.json b/tests/results/test/40_0leadership_diff_name.json index f80b394c7..f76e80d5f 100644 --- a/tests/results/test/40_0leadership_diff_name.json +++ b/tests/results/test/40_0leadership_diff_name.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test/40_0leadership_follower_default_calculation.json b/tests/results/test/40_0leadership_follower_default_calculation.json index e60ec6efe..8bc42fa10 100644 --- a/tests/results/test/40_0leadership_follower_default_calculation.json +++ b/tests/results/test/40_0leadership_follower_default_calculation.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_0leadership_follower_default_value.json b/tests/results/test/40_0leadership_follower_default_value.json index ade859d17..5a4b760a5 100644 --- a/tests/results/test/40_0leadership_follower_default_value.json +++ b/tests/results/test/40_0leadership_follower_default_value.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_0leadership_leader_follower.json b/tests/results/test/40_0leadership_leader_follower.json index 61593085d..b813c0719 100644 --- a/tests/results/test/40_0leadership_leader_follower.json +++ b/tests/results/test/40_0leadership_leader_follower.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test/40_0leadership_leader_not_multi.json b/tests/results/test/40_0leadership_leader_not_multi.json index 992a0af31..7c05b348c 100644 --- a/tests/results/test/40_0leadership_leader_not_multi.json +++ b/tests/results/test/40_0leadership_leader_not_multi.json @@ -40,7 +40,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "general1.leader", "name": "leader", diff --git a/tests/results/test/40_0leadership_reduce.json b/tests/results/test/40_0leadership_reduce.json index 54a5fc961..f7a6be7b1 100644 --- a/tests/results/test/40_0leadership_reduce.json +++ b/tests/results/test/40_0leadership_reduce.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test/40_1leadership_append_follower.json b/tests/results/test/40_1leadership_append_follower.json index 07d65641e..61a48bee9 100644 --- a/tests/results/test/40_1leadership_append_follower.json +++ b/tests/results/test/40_1leadership_append_follower.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_2leadership_calculation_index.json b/tests/results/test/40_2leadership_calculation_index.json index cd802e61d..7eb223e25 100644 --- a/tests/results/test/40_2leadership_calculation_index.json +++ b/tests/results/test/40_2leadership_calculation_index.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_2leadership_calculation_index_2.json b/tests/results/test/40_2leadership_calculation_index_2.json index cd802e61d..7eb223e25 100644 --- a/tests/results/test/40_2leadership_calculation_index_2.json +++ b/tests/results/test/40_2leadership_calculation_index_2.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_6leadership_follower_multi.json b/tests/results/test/40_6leadership_follower_multi.json index 8255b8b54..29257dc95 100644 --- a/tests/results/test/40_6leadership_follower_multi.json +++ b/tests/results/test/40_6leadership_follower_multi.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test/40_6leadership_follower_multi_no_mandatory.json b/tests/results/test/40_6leadership_follower_multi_no_mandatory.json index e226bccc0..29aa34536 100644 --- a/tests/results/test/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test/40_6leadership_follower_multi_no_mandatory.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test/40_9calculation_variable_leader_follower_multi_inside.json index 94cc000c4..26e752e92 100644 --- a/tests/results/test/40_9calculation_variable_leader_follower_multi_inside.json +++ b/tests/results/test/40_9calculation_variable_leader_follower_multi_inside.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test/40_9leadership-calculation-outside-follower-first.json b/tests/results/test/40_9leadership-calculation-outside-follower-first.json index 87c888bff..b26eaee64 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower-first.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_9leadership-calculation-outside-follower-last.json b/tests/results/test/40_9leadership-calculation-outside-follower-last.json index 87c888bff..b26eaee64 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower-last.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test/40_9leadership-calculation-outside-follower-no-mandatory.json index 40cc9aec8..84e34b60b 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower-no-mandatory.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_9leadership-calculation-outside-follower.json b/tests/results/test/40_9leadership-calculation-outside-follower.json index bcf4432ba..db738454b 100644 --- a/tests/results/test/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test/40_9leadership-calculation-outside-follower.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_9leadership-calculation-outside-leader-first.json b/tests/results/test/40_9leadership-calculation-outside-leader-first.json index d0c97f044..1940f53c1 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader-first.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_9leadership-calculation-outside-leader-last.json b/tests/results/test/40_9leadership-calculation-outside-leader-last.json index d0c97f044..1940f53c1 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader-last.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_9leadership-calculation-outside-leader.json b/tests/results/test/40_9leadership-calculation-outside-leader.json index 1c33c94cc..be4e22826 100644 --- a/tests/results/test/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test/40_9leadership-calculation-outside-leader.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_9leadership-calculation-variable.json b/tests/results/test/40_9leadership-calculation-variable.json index 117b044fe..702b6e516 100644 --- a/tests/results/test/40_9leadership-calculation-variable.json +++ b/tests/results/test/40_9leadership-calculation-variable.json @@ -30,7 +30,7 @@ "multiple": true }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test/40_9leadership-calculation-variable_leader_follower.json index 82ac28004..c5903ee2a 100644 --- a/tests/results/test/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test/40_9leadership-calculation-variable_leader_follower.json @@ -1,6 +1,6 @@ { "leadership_1": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership_1", "name": "leadership_1", @@ -61,7 +61,7 @@ } }, "leadership_2": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership_2", "name": "leadership_2", diff --git a/tests/results/test/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test/40_9leadership-calculation-variable_leader_follower_not_same.json index b1c44acc1..4e813e1c6 100644 --- a/tests/results/test/40_9leadership-calculation-variable_leader_follower_not_same.json +++ b/tests/results/test/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -1,6 +1,6 @@ { "leadership_1": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership_1", "name": "leadership_1", @@ -61,7 +61,7 @@ } }, "leadership_2": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership_2", "name": "leadership_2", diff --git a/tests/results/test/41_0choice_leader.json b/tests/results/test/41_0choice_leader.json index 474687e50..a34edfdf4 100644 --- a/tests/results/test/41_0choice_leader.json +++ b/tests/results/test/41_0choice_leader.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/44_4disabled_calcultion_follower_index.json b/tests/results/test/44_4disabled_calcultion_follower_index.json index 2e8bbb1cd..90563495c 100644 --- a/tests/results/test/44_4disabled_calcultion_follower_index.json +++ b/tests/results/test/44_4disabled_calcultion_follower_index.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test/44_4leadership_mandatory.json b/tests/results/test/44_4leadership_mandatory.json index 0f515ec57..e28f2e536 100644 --- a/tests/results/test/44_4leadership_mandatory.json +++ b/tests/results/test/44_4leadership_mandatory.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/44_4leadership_mandatory_follower.json b/tests/results/test/44_4leadership_mandatory_follower.json index ac79d6bef..961427770 100644 --- a/tests/results/test/44_4leadership_mandatory_follower.json +++ b/tests/results/test/44_4leadership_mandatory_follower.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/44_5leadership_leader_hidden_calculation.json b/tests/results/test/44_5leadership_leader_hidden_calculation.json index f95f59970..3a077f511 100644 --- a/tests/results/test/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test/44_5leadership_leader_hidden_calculation.json @@ -20,7 +20,7 @@ "variable_type": "string" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/44_6leadership_follower_disabled_calculation.json b/tests/results/test/44_6leadership_follower_disabled_calculation.json index 335185afa..d549c92f4 100644 --- a/tests/results/test/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test/44_6leadership_follower_disabled_calculation.json @@ -20,7 +20,7 @@ "variable_type": "string" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test/60_6family_dynamic_leadership.json b/tests/results/test/60_6family_dynamic_leadership.json index 6dad7734d..b7854d019 100644 --- a/tests/results/test/60_6family_dynamic_leadership.json +++ b/tests/results/test/60_6family_dynamic_leadership.json @@ -62,7 +62,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "dyn{{ identifier }}.leadership", "name": "leadership", diff --git a/tests/results/test/60_6family_dynamic_leadership_empty.json b/tests/results/test/60_6family_dynamic_leadership_empty.json index 184891933..b7e57a0fb 100644 --- a/tests/results/test/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test/60_6family_dynamic_leadership_empty.json @@ -56,7 +56,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "dyn{{ identifier }}.leadership", "name": "leadership", diff --git a/tests/results/test/68_0family_leadership_mode.json b/tests/results/test/68_0family_leadership_mode.json index 65e8c5318..1caeebbc3 100644 --- a/tests/results/test/68_0family_leadership_mode.json +++ b/tests/results/test/68_0family_leadership_mode.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_examples/00_9default_calculation.adoc b/tests/results/test_examples/00_9default_calculation.adoc index 8fe624608..26af6843b 100644 --- a/tests/results/test_examples/00_9default_calculation.adoc +++ b/tests/results/test_examples/00_9default_calculation.adoc @@ -3,5 +3,5 @@ [,yaml] ---- --- -variable: string_1_True_ +variable: string_1_True_None ---- diff --git a/tests/results/test_examples/00_9default_calculation.gitlab.md b/tests/results/test_examples/00_9default_calculation.gitlab.md index 338161dcf..b4f6206f9 100644 --- a/tests/results/test_examples/00_9default_calculation.gitlab.md +++ b/tests/results/test_examples/00_9default_calculation.gitlab.md @@ -2,7 +2,7 @@ ```yaml --- -variable: string_1_True_ +variable: string_1_True_None ``` \ No newline at end of file diff --git a/tests/results/test_examples/00_9default_calculation.html b/tests/results/test_examples/00_9default_calculation.html index 974198dcb..08983c43a 100644 --- a/tests/results/test_examples/00_9default_calculation.html +++ b/tests/results/test_examples/00_9default_calculation.html @@ -1,4 +1,4 @@
--- -variable: string_1_True_\ No newline at end of file +variable: string_1_True_None \ No newline at end of file diff --git a/tests/results/test_examples/00_9default_calculation.md b/tests/results/test_examples/00_9default_calculation.md index 856b845f3..d3a3b9a35 100644 --- a/tests/results/test_examples/00_9default_calculation.md +++ b/tests/results/test_examples/00_9default_calculation.md @@ -2,5 +2,5 @@ ```yaml --- -variable: string_1_True_ +variable: string_1_True_None ``` \ No newline at end of file diff --git a/tests/results/test_examples/00_9default_calculation.sh b/tests/results/test_examples/00_9default_calculation.sh index 81cd8e09c..8ba2bbc80 100644 --- a/tests/results/test_examples/00_9default_calculation.sh +++ b/tests/results/test_examples/00_9default_calculation.sh @@ -1,5 +1,5 @@ [1;4;96mExample with all variables modifiable[0m [38;2;248;248;242;48;2;39;40;34m---[0m[48;2;39;40;34m [0m -[38;2;255;70;137;48;2;39;40;34mvariable[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[48;2;39;40;34mstring_1_True_ [0m +[38;2;255;70;137;48;2;39;40;34mvariable[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[48;2;39;40;34mstring_1_True_None [0m diff --git a/tests/results/test_examples_comment/00_9default_calculation.adoc b/tests/results/test_examples_comment/00_9default_calculation.adoc index 0e2b0a3e4..e7bb90b96 100644 --- a/tests/results/test_examples_comment/00_9default_calculation.adoc +++ b/tests/results/test_examples_comment/00_9default_calculation.adoc @@ -3,5 +3,5 @@ [,yaml] ---- --- -variable: string_1_True_ # A variable +variable: string_1_True_None # A variable ---- diff --git a/tests/results/test_examples_comment/00_9default_calculation.gitlab.md b/tests/results/test_examples_comment/00_9default_calculation.gitlab.md index 609853836..673f76543 100644 --- a/tests/results/test_examples_comment/00_9default_calculation.gitlab.md +++ b/tests/results/test_examples_comment/00_9default_calculation.gitlab.md @@ -2,7 +2,7 @@ ```yaml --- -variable: string_1_True_ # A variable +variable: string_1_True_None # A variable ``` \ No newline at end of file diff --git a/tests/results/test_examples_comment/00_9default_calculation.html b/tests/results/test_examples_comment/00_9default_calculation.html index 1a2ee98a4..50dad8d11 100644 --- a/tests/results/test_examples_comment/00_9default_calculation.html +++ b/tests/results/test_examples_comment/00_9default_calculation.html @@ -1,4 +1,4 @@
--- -variable: string_1_True_ # A variable\ No newline at end of file +variable: string_1_True_None # A variable \ No newline at end of file diff --git a/tests/results/test_examples_comment/00_9default_calculation.md b/tests/results/test_examples_comment/00_9default_calculation.md index ab4ff4e1b..aab1466c2 100644 --- a/tests/results/test_examples_comment/00_9default_calculation.md +++ b/tests/results/test_examples_comment/00_9default_calculation.md @@ -2,5 +2,5 @@ ```yaml --- -variable: string_1_True_ # A variable +variable: string_1_True_None # A variable ``` \ No newline at end of file diff --git a/tests/results/test_examples_comment/00_9default_calculation.sh b/tests/results/test_examples_comment/00_9default_calculation.sh index 99ff2a0d4..9ad1033ca 100644 --- a/tests/results/test_examples_comment/00_9default_calculation.sh +++ b/tests/results/test_examples_comment/00_9default_calculation.sh @@ -1,5 +1,5 @@ [1;4;96mExample with all variables modifiable[0m [38;2;248;248;242;48;2;39;40;34m---[0m[48;2;39;40;34m [0m -[38;2;255;70;137;48;2;39;40;34mvariable[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[48;2;39;40;34mstring_1_True_[0m[38;2;248;248;242;48;2;39;40;34m [0m[38;2;149;144;119;48;2;39;40;34m# A variable[0m[48;2;39;40;34m [0m +[38;2;255;70;137;48;2;39;40;34mvariable[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[48;2;39;40;34mstring_1_True_None[0m[38;2;248;248;242;48;2;39;40;34m [0m[38;2;149;144;119;48;2;39;40;34m# A variable[0m[48;2;39;40;34m [0m diff --git a/tests/results/test_namespace/40_0leadership.json b/tests/results/test_namespace/40_0leadership.json index 9eb491f58..cc3839e4e 100644 --- a/tests/results/test_namespace/40_0leadership.json +++ b/tests/results/test_namespace/40_0leadership.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_0leadership_diff_name.json b/tests/results/test_namespace/40_0leadership_diff_name.json index 1caf9618f..add7933ea 100644 --- a/tests/results/test_namespace/40_0leadership_diff_name.json +++ b/tests/results/test_namespace/40_0leadership_diff_name.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/40_0leadership_follower_default_calculation.json b/tests/results/test_namespace/40_0leadership_follower_default_calculation.json index df93e3ae4..ffb1e3628 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_calculation.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_calculation.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_0leadership_follower_default_submulti.json b/tests/results/test_namespace/40_0leadership_follower_default_submulti.json index 853d5c461..b8695ae8c 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_submulti.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_submulti.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json b/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json index 5d6f1d9b4..a98c777ff 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_submulti_calculation.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_0leadership_follower_default_value.json b/tests/results/test_namespace/40_0leadership_follower_default_value.json index adc1dfcae..7ad99f657 100644 --- a/tests/results/test_namespace/40_0leadership_follower_default_value.json +++ b/tests/results/test_namespace/40_0leadership_follower_default_value.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_0leadership_leader_follower.json b/tests/results/test_namespace/40_0leadership_leader_follower.json index 1d68134e0..2a99fe396 100644 --- a/tests/results/test_namespace/40_0leadership_leader_follower.json +++ b/tests/results/test_namespace/40_0leadership_leader_follower.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/40_0leadership_leader_not_multi.json b/tests/results/test_namespace/40_0leadership_leader_not_multi.json index 4cbb9baf6..ccb400f69 100644 --- a/tests/results/test_namespace/40_0leadership_leader_not_multi.json +++ b/tests/results/test_namespace/40_0leadership_leader_not_multi.json @@ -53,7 +53,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.general1.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_0leadership_reduce.json b/tests/results/test_namespace/40_0leadership_reduce.json index 6478a1f88..91e56fae8 100644 --- a/tests/results/test_namespace/40_0leadership_reduce.json +++ b/tests/results/test_namespace/40_0leadership_reduce.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/40_1leadership_append_follower.json b/tests/results/test_namespace/40_1leadership_append_follower.json index 87d8d43a5..cce43f1c9 100644 --- a/tests/results/test_namespace/40_1leadership_append_follower.json +++ b/tests/results/test_namespace/40_1leadership_append_follower.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_2leadership_calculation_index.json b/tests/results/test_namespace/40_2leadership_calculation_index.json index dd2127f2b..20a4560cc 100644 --- a/tests/results/test_namespace/40_2leadership_calculation_index.json +++ b/tests/results/test_namespace/40_2leadership_calculation_index.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_2leadership_calculation_index_2.json b/tests/results/test_namespace/40_2leadership_calculation_index_2.json index dd2127f2b..20a4560cc 100644 --- a/tests/results/test_namespace/40_2leadership_calculation_index_2.json +++ b/tests/results/test_namespace/40_2leadership_calculation_index_2.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_2leadership_calculation_param_index.json b/tests/results/test_namespace/40_2leadership_calculation_param_index.json index 80aa96e11..c84c2a85c 100644 --- a/tests/results/test_namespace/40_2leadership_calculation_param_index.json +++ b/tests/results/test_namespace/40_2leadership_calculation_param_index.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_2leadership_leader_calculation.json b/tests/results/test_namespace/40_2leadership_leader_calculation.json index ba6840867..51ed20e15 100644 --- a/tests/results/test_namespace/40_2leadership_leader_calculation.json +++ b/tests/results/test_namespace/40_2leadership_leader_calculation.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_6leadership_follower_multi.json b/tests/results/test_namespace/40_6leadership_follower_multi.json index e9ed06b95..aaa236195 100644 --- a/tests/results/test_namespace/40_6leadership_follower_multi.json +++ b/tests/results/test_namespace/40_6leadership_follower_multi.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/40_6leadership_follower_multi_no_mandatory.json b/tests/results/test_namespace/40_6leadership_follower_multi_no_mandatory.json index 080c7e3bb..309c6e03d 100644 --- a/tests/results/test_namespace/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test_namespace/40_6leadership_follower_multi_no_mandatory.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json index 27a47f55d..dfccf9811 100644 --- a/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json +++ b/tests/results/test_namespace/40_9calculation_variable_leader_follower_multi_inside.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json index 24954956d..453e6d834 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-first.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json index 24954956d..453e6d834 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-last.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json index 631eb9442..c767ad696 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json b/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json index 0f7a65536..07ff52cda 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-follower.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json index 585944e59..7042af0f1 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-first.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json index 585944e59..7042af0f1 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader-last.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json b/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json index c795696c4..21b8a24ff 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test_namespace/40_9leadership-calculation-outside-leader.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable.json b/tests/results/test_namespace/40_9leadership-calculation-variable.json index 6051cb44f..f232851f9 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-variable.json +++ b/tests/results/test_namespace/40_9leadership-calculation-variable.json @@ -43,7 +43,7 @@ "multiple": true }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json index 3f8a9ca2f..8ff5099b8 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower.json @@ -13,7 +13,7 @@ }, "children": { "leadership_1": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership_1", "name": "leadership_1", @@ -74,7 +74,7 @@ } }, "leadership_2": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership_2", "name": "leadership_2", diff --git a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json index 890a1fa3d..6dc66c68f 100644 --- a/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json +++ b/tests/results/test_namespace/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -13,7 +13,7 @@ }, "children": { "leadership_1": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership_1", "name": "leadership_1", @@ -74,7 +74,7 @@ } }, "leadership_2": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership_2", "name": "leadership_2", diff --git a/tests/results/test_namespace/41_0choice_leader.json b/tests/results/test_namespace/41_0choice_leader.json index 65c3e8237..5be8d94f7 100644 --- a/tests/results/test_namespace/41_0choice_leader.json +++ b/tests/results/test_namespace/41_0choice_leader.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower.json b/tests/results/test_namespace/44_4disabled_calcultion_follower.json index 99d1a1b54..6874d0d00 100644 --- a/tests/results/test_namespace/44_4disabled_calcultion_follower.json +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower.json @@ -33,7 +33,7 @@ "variable_type": "boolean" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json index 28aa86132..36b40a373 100644 --- a/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json +++ b/tests/results/test_namespace/44_4disabled_calcultion_follower_index.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/44_4leadership_mandatory.json b/tests/results/test_namespace/44_4leadership_mandatory.json index 609b277ce..af7bc538f 100644 --- a/tests/results/test_namespace/44_4leadership_mandatory.json +++ b/tests/results/test_namespace/44_4leadership_mandatory.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/44_4leadership_mandatory_follower.json b/tests/results/test_namespace/44_4leadership_mandatory_follower.json index 333350f84..bff6f224e 100644 --- a/tests/results/test_namespace/44_4leadership_mandatory_follower.json +++ b/tests/results/test_namespace/44_4leadership_mandatory_follower.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json b/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json index 2fc8c38d0..b0b693046 100644 --- a/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test_namespace/44_5leadership_leader_hidden_calculation.json @@ -33,7 +33,7 @@ "variable_type": "string" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json b/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json index 0b142f8cd..53f0ba6bc 100644 --- a/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test_namespace/44_6leadership_follower_disabled_calculation.json @@ -33,7 +33,7 @@ "variable_type": "string" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/44_9calculated_default_leadership_leader.json b/tests/results/test_namespace/44_9calculated_default_leadership_leader.json index c4bd3ef3b..b646f7691 100644 --- a/tests/results/test_namespace/44_9calculated_default_leadership_leader.json +++ b/tests/results/test_namespace/44_9calculated_default_leadership_leader.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace/60_6family_dynamic_leadership.json b/tests/results/test_namespace/60_6family_dynamic_leadership.json index 3af5323a6..7f89515ea 100644 --- a/tests/results/test_namespace/60_6family_dynamic_leadership.json +++ b/tests/results/test_namespace/60_6family_dynamic_leadership.json @@ -75,7 +75,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.dyn{{ identifier }}.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json b/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json index d02507c9e..315ecea5b 100644 --- a/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test_namespace/60_6family_dynamic_leadership_empty.json @@ -69,7 +69,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.dyn{{ identifier }}.leadership", "name": "leadership", diff --git a/tests/results/test_namespace/68_0family_leadership_mode.json b/tests/results/test_namespace/68_0family_leadership_mode.json index 10accd09c..d07dacf91 100644 --- a/tests/results/test_namespace/68_0family_leadership_mode.json +++ b/tests/results/test_namespace/68_0family_leadership_mode.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_examples/00_9default_calculation.adoc b/tests/results/test_namespace_examples/00_9default_calculation.adoc index 8136b57c6..73052a66b 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation.adoc +++ b/tests/results/test_namespace_examples/00_9default_calculation.adoc @@ -4,5 +4,5 @@ ---- --- rougail: - variable: string_1_True_ + variable: string_1_True_None ---- diff --git a/tests/results/test_namespace_examples/00_9default_calculation.gitlab.md b/tests/results/test_namespace_examples/00_9default_calculation.gitlab.md index 68284035a..d3e496869 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation.gitlab.md +++ b/tests/results/test_namespace_examples/00_9default_calculation.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: - variable: string_1_True_ + variable: string_1_True_None ``` \ No newline at end of file diff --git a/tests/results/test_namespace_examples/00_9default_calculation.html b/tests/results/test_namespace_examples/00_9default_calculation.html index 700f4ee23..960b58d83 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation.html +++ b/tests/results/test_namespace_examples/00_9default_calculation.html @@ -2,4 +2,4 @@
--- rougail: - variable: string_1_True_\ No newline at end of file + variable: string_1_True_None \ No newline at end of file diff --git a/tests/results/test_namespace_examples/00_9default_calculation.md b/tests/results/test_namespace_examples/00_9default_calculation.md index 0d8206d24..a2d42cf5a 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation.md +++ b/tests/results/test_namespace_examples/00_9default_calculation.md @@ -3,5 +3,5 @@ ```yaml --- rougail: - variable: string_1_True_ + variable: string_1_True_None ``` \ No newline at end of file diff --git a/tests/results/test_namespace_examples/00_9default_calculation.sh b/tests/results/test_namespace_examples/00_9default_calculation.sh index 681cbaa8f..aae49ac73 100644 --- a/tests/results/test_namespace_examples/00_9default_calculation.sh +++ b/tests/results/test_namespace_examples/00_9default_calculation.sh @@ -2,5 +2,5 @@ [38;2;248;248;242;48;2;39;40;34m---[0m[48;2;39;40;34m [0m [38;2;255;70;137;48;2;39;40;34mrougail[0m[38;2;248;248;242;48;2;39;40;34m:[0m[48;2;39;40;34m [0m -[38;2;248;248;242;48;2;39;40;34m [0m[38;2;255;70;137;48;2;39;40;34mvariable[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[48;2;39;40;34mstring_1_True_ [0m +[38;2;248;248;242;48;2;39;40;34m [0m[38;2;255;70;137;48;2;39;40;34mvariable[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[48;2;39;40;34mstring_1_True_None [0m diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation.adoc b/tests/results/test_namespace_examples_comment/00_9default_calculation.adoc index b595db296..70b4e8860 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation.adoc +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation.adoc @@ -4,5 +4,5 @@ ---- --- rougail: # Rougail - variable: string_1_True_ # A variable + variable: string_1_True_None # A variable ---- diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation.gitlab.md b/tests/results/test_namespace_examples_comment/00_9default_calculation.gitlab.md index 196a1b298..398aa35b0 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation.gitlab.md +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation.gitlab.md @@ -3,7 +3,7 @@ ```yaml --- rougail: # Rougail - variable: string_1_True_ # A variable + variable: string_1_True_None # A variable ``` \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation.html b/tests/results/test_namespace_examples_comment/00_9default_calculation.html index 073e8edd4..d8f9007dc 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation.html +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation.html @@ -2,4 +2,4 @@
--- rougail: # Rougail - variable: string_1_True_ # A variable\ No newline at end of file + variable: string_1_True_None # A variable \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation.md b/tests/results/test_namespace_examples_comment/00_9default_calculation.md index 75bb60ad9..8d54eaf1a 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation.md +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation.md @@ -3,5 +3,5 @@ ```yaml --- rougail: # Rougail - variable: string_1_True_ # A variable + variable: string_1_True_None # A variable ``` \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/00_9default_calculation.sh b/tests/results/test_namespace_examples_comment/00_9default_calculation.sh index 1bcb3cd45..1daca02be 100644 --- a/tests/results/test_namespace_examples_comment/00_9default_calculation.sh +++ b/tests/results/test_namespace_examples_comment/00_9default_calculation.sh @@ -2,5 +2,5 @@ [38;2;248;248;242;48;2;39;40;34m---[0m[48;2;39;40;34m [0m [38;2;255;70;137;48;2;39;40;34mrougail[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[38;2;149;144;119;48;2;39;40;34m# Rougail[0m[48;2;39;40;34m [0m -[38;2;248;248;242;48;2;39;40;34m [0m[38;2;255;70;137;48;2;39;40;34mvariable[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[48;2;39;40;34mstring_1_True_[0m[38;2;248;248;242;48;2;39;40;34m [0m[38;2;149;144;119;48;2;39;40;34m# A variable[0m[48;2;39;40;34m [0m +[38;2;248;248;242;48;2;39;40;34m [0m[38;2;255;70;137;48;2;39;40;34mvariable[0m[38;2;248;248;242;48;2;39;40;34m:[0m[38;2;248;248;242;48;2;39;40;34m [0m[48;2;39;40;34mstring_1_True_None[0m[38;2;248;248;242;48;2;39;40;34m [0m[38;2;149;144;119;48;2;39;40;34m# A variable[0m[48;2;39;40;34m [0m diff --git a/tests/results/test_namespace_without_family/40_0leadership.json b/tests/results/test_namespace_without_family/40_0leadership.json index 9eb491f58..cc3839e4e 100644 --- a/tests/results/test_namespace_without_family/40_0leadership.json +++ b/tests/results/test_namespace_without_family/40_0leadership.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_0leadership_diff_name.json b/tests/results/test_namespace_without_family/40_0leadership_diff_name.json index 1caf9618f..add7933ea 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_diff_name.json +++ b/tests/results/test_namespace_without_family/40_0leadership_diff_name.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/40_0leadership_follower_default_calculation.json b/tests/results/test_namespace_without_family/40_0leadership_follower_default_calculation.json index df93e3ae4..ffb1e3628 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_follower_default_calculation.json +++ b/tests/results/test_namespace_without_family/40_0leadership_follower_default_calculation.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti.json b/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti.json index 853d5c461..b8695ae8c 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti.json +++ b/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti_calculation.json b/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti_calculation.json index 5d6f1d9b4..a98c777ff 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti_calculation.json +++ b/tests/results/test_namespace_without_family/40_0leadership_follower_default_submulti_calculation.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_0leadership_follower_default_value.json b/tests/results/test_namespace_without_family/40_0leadership_follower_default_value.json index adc1dfcae..7ad99f657 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_follower_default_value.json +++ b/tests/results/test_namespace_without_family/40_0leadership_follower_default_value.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_0leadership_leader_follower.json b/tests/results/test_namespace_without_family/40_0leadership_leader_follower.json index 1d68134e0..2a99fe396 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_leader_follower.json +++ b/tests/results/test_namespace_without_family/40_0leadership_leader_follower.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/40_0leadership_leader_not_multi.json b/tests/results/test_namespace_without_family/40_0leadership_leader_not_multi.json index 4cbb9baf6..ccb400f69 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_leader_not_multi.json +++ b/tests/results/test_namespace_without_family/40_0leadership_leader_not_multi.json @@ -53,7 +53,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.general1.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_0leadership_reduce.json b/tests/results/test_namespace_without_family/40_0leadership_reduce.json index 6478a1f88..91e56fae8 100644 --- a/tests/results/test_namespace_without_family/40_0leadership_reduce.json +++ b/tests/results/test_namespace_without_family/40_0leadership_reduce.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/40_1leadership_append_follower.json b/tests/results/test_namespace_without_family/40_1leadership_append_follower.json index 87d8d43a5..cce43f1c9 100644 --- a/tests/results/test_namespace_without_family/40_1leadership_append_follower.json +++ b/tests/results/test_namespace_without_family/40_1leadership_append_follower.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_2leadership_calculation_index.json b/tests/results/test_namespace_without_family/40_2leadership_calculation_index.json index dd2127f2b..20a4560cc 100644 --- a/tests/results/test_namespace_without_family/40_2leadership_calculation_index.json +++ b/tests/results/test_namespace_without_family/40_2leadership_calculation_index.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_2leadership_calculation_index_2.json b/tests/results/test_namespace_without_family/40_2leadership_calculation_index_2.json index dd2127f2b..20a4560cc 100644 --- a/tests/results/test_namespace_without_family/40_2leadership_calculation_index_2.json +++ b/tests/results/test_namespace_without_family/40_2leadership_calculation_index_2.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_2leadership_calculation_param_index.json b/tests/results/test_namespace_without_family/40_2leadership_calculation_param_index.json index 80aa96e11..c84c2a85c 100644 --- a/tests/results/test_namespace_without_family/40_2leadership_calculation_param_index.json +++ b/tests/results/test_namespace_without_family/40_2leadership_calculation_param_index.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_2leadership_leader_calculation.json b/tests/results/test_namespace_without_family/40_2leadership_leader_calculation.json index ba6840867..51ed20e15 100644 --- a/tests/results/test_namespace_without_family/40_2leadership_leader_calculation.json +++ b/tests/results/test_namespace_without_family/40_2leadership_leader_calculation.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_6leadership_follower_multi.json b/tests/results/test_namespace_without_family/40_6leadership_follower_multi.json index e9ed06b95..aaa236195 100644 --- a/tests/results/test_namespace_without_family/40_6leadership_follower_multi.json +++ b/tests/results/test_namespace_without_family/40_6leadership_follower_multi.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/40_6leadership_follower_multi_no_mandatory.json b/tests/results/test_namespace_without_family/40_6leadership_follower_multi_no_mandatory.json index 080c7e3bb..309c6e03d 100644 --- a/tests/results/test_namespace_without_family/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test_namespace_without_family/40_6leadership_follower_multi_no_mandatory.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_namespace_without_family/40_9calculation_variable_leader_follower_multi_inside.json index 27a47f55d..dfccf9811 100644 --- a/tests/results/test_namespace_without_family/40_9calculation_variable_leader_follower_multi_inside.json +++ b/tests/results/test_namespace_without_family/40_9calculation_variable_leader_follower_multi_inside.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-first.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-first.json index 24954956d..453e6d834 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-first.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-last.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-last.json index 24954956d..453e6d834 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-last.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json index 631eb9442..c767ad696 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower.json index 0f7a65536..07ff52cda 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-follower.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-first.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-first.json index 585944e59..7042af0f1 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-first.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-last.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-last.json index 585944e59..7042af0f1 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader-last.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader.json index c795696c4..21b8a24ff 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-outside-leader.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable.json index 6051cb44f..f232851f9 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable.json @@ -43,7 +43,7 @@ "multiple": true }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower.json index 3f8a9ca2f..8ff5099b8 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower.json @@ -13,7 +13,7 @@ }, "children": { "leadership_1": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership_1", "name": "leadership_1", @@ -74,7 +74,7 @@ } }, "leadership_2": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership_2", "name": "leadership_2", diff --git a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json index 890a1fa3d..6dc66c68f 100644 --- a/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json +++ b/tests/results/test_namespace_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -13,7 +13,7 @@ }, "children": { "leadership_1": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership_1", "name": "leadership_1", @@ -74,7 +74,7 @@ } }, "leadership_2": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership_2", "name": "leadership_2", diff --git a/tests/results/test_namespace_without_family/41_0choice_leader.json b/tests/results/test_namespace_without_family/41_0choice_leader.json index 65c3e8237..5be8d94f7 100644 --- a/tests/results/test_namespace_without_family/41_0choice_leader.json +++ b/tests/results/test_namespace_without_family/41_0choice_leader.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower.json b/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower.json index 99d1a1b54..6874d0d00 100644 --- a/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower.json +++ b/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower.json @@ -33,7 +33,7 @@ "variable_type": "boolean" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower_index.json b/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower_index.json index 28aa86132..36b40a373 100644 --- a/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower_index.json +++ b/tests/results/test_namespace_without_family/44_4disabled_calcultion_follower_index.json @@ -13,7 +13,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/44_4leadership_mandatory.json b/tests/results/test_namespace_without_family/44_4leadership_mandatory.json index 609b277ce..af7bc538f 100644 --- a/tests/results/test_namespace_without_family/44_4leadership_mandatory.json +++ b/tests/results/test_namespace_without_family/44_4leadership_mandatory.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/44_4leadership_mandatory_follower.json b/tests/results/test_namespace_without_family/44_4leadership_mandatory_follower.json index 333350f84..bff6f224e 100644 --- a/tests/results/test_namespace_without_family/44_4leadership_mandatory_follower.json +++ b/tests/results/test_namespace_without_family/44_4leadership_mandatory_follower.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/44_5leadership_leader_hidden_calculation.json b/tests/results/test_namespace_without_family/44_5leadership_leader_hidden_calculation.json index 2fc8c38d0..b0b693046 100644 --- a/tests/results/test_namespace_without_family/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test_namespace_without_family/44_5leadership_leader_hidden_calculation.json @@ -33,7 +33,7 @@ "variable_type": "string" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/44_6leadership_follower_disabled_calculation.json b/tests/results/test_namespace_without_family/44_6leadership_follower_disabled_calculation.json index 0b142f8cd..53f0ba6bc 100644 --- a/tests/results/test_namespace_without_family/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test_namespace_without_family/44_6leadership_follower_disabled_calculation.json @@ -33,7 +33,7 @@ "variable_type": "string" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.json b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.json index c4bd3ef3b..b646f7691 100644 --- a/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.json +++ b/tests/results/test_namespace_without_family/44_9calculated_default_leadership_leader.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_leadership.json b/tests/results/test_namespace_without_family/60_6family_dynamic_leadership.json index 3af5323a6..7f89515ea 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_leadership.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_leadership.json @@ -75,7 +75,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.dyn{{ identifier }}.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/60_6family_dynamic_leadership_empty.json b/tests/results/test_namespace_without_family/60_6family_dynamic_leadership_empty.json index d02507c9e..315ecea5b 100644 --- a/tests/results/test_namespace_without_family/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test_namespace_without_family/60_6family_dynamic_leadership_empty.json @@ -69,7 +69,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.dyn{{ identifier }}.leadership", "name": "leadership", diff --git a/tests/results/test_namespace_without_family/68_0family_leadership_mode.json b/tests/results/test_namespace_without_family/68_0family_leadership_mode.json index 10accd09c..d07dacf91 100644 --- a/tests/results/test_namespace_without_family/68_0family_leadership_mode.json +++ b/tests/results/test_namespace_without_family/68_0family_leadership_mode.json @@ -13,7 +13,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "rougail.leader", "name": "leader", diff --git a/tests/results/test_without_family/40_0leadership.json b/tests/results/test_without_family/40_0leadership.json index 5df64f007..35686f2bb 100644 --- a/tests/results/test_without_family/40_0leadership.json +++ b/tests/results/test_without_family/40_0leadership.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_0leadership_diff_name.json b/tests/results/test_without_family/40_0leadership_diff_name.json index f80b394c7..f76e80d5f 100644 --- a/tests/results/test_without_family/40_0leadership_diff_name.json +++ b/tests/results/test_without_family/40_0leadership_diff_name.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test_without_family/40_0leadership_follower_default_calculation.json b/tests/results/test_without_family/40_0leadership_follower_default_calculation.json index e60ec6efe..8bc42fa10 100644 --- a/tests/results/test_without_family/40_0leadership_follower_default_calculation.json +++ b/tests/results/test_without_family/40_0leadership_follower_default_calculation.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_0leadership_follower_default_value.json b/tests/results/test_without_family/40_0leadership_follower_default_value.json index ade859d17..5a4b760a5 100644 --- a/tests/results/test_without_family/40_0leadership_follower_default_value.json +++ b/tests/results/test_without_family/40_0leadership_follower_default_value.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_0leadership_leader_follower.json b/tests/results/test_without_family/40_0leadership_leader_follower.json index 61593085d..b813c0719 100644 --- a/tests/results/test_without_family/40_0leadership_leader_follower.json +++ b/tests/results/test_without_family/40_0leadership_leader_follower.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test_without_family/40_0leadership_leader_not_multi.json b/tests/results/test_without_family/40_0leadership_leader_not_multi.json index 992a0af31..7c05b348c 100644 --- a/tests/results/test_without_family/40_0leadership_leader_not_multi.json +++ b/tests/results/test_without_family/40_0leadership_leader_not_multi.json @@ -40,7 +40,7 @@ }, "children": { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "general1.leader", "name": "leader", diff --git a/tests/results/test_without_family/40_0leadership_reduce.json b/tests/results/test_without_family/40_0leadership_reduce.json index 54a5fc961..f7a6be7b1 100644 --- a/tests/results/test_without_family/40_0leadership_reduce.json +++ b/tests/results/test_without_family/40_0leadership_reduce.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test_without_family/40_1leadership_append_follower.json b/tests/results/test_without_family/40_1leadership_append_follower.json index 07d65641e..61a48bee9 100644 --- a/tests/results/test_without_family/40_1leadership_append_follower.json +++ b/tests/results/test_without_family/40_1leadership_append_follower.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_2leadership_calculation_index.json b/tests/results/test_without_family/40_2leadership_calculation_index.json index cd802e61d..7eb223e25 100644 --- a/tests/results/test_without_family/40_2leadership_calculation_index.json +++ b/tests/results/test_without_family/40_2leadership_calculation_index.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_2leadership_calculation_index_2.json b/tests/results/test_without_family/40_2leadership_calculation_index_2.json index cd802e61d..7eb223e25 100644 --- a/tests/results/test_without_family/40_2leadership_calculation_index_2.json +++ b/tests/results/test_without_family/40_2leadership_calculation_index_2.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_6leadership_follower_multi.json b/tests/results/test_without_family/40_6leadership_follower_multi.json index 8255b8b54..29257dc95 100644 --- a/tests/results/test_without_family/40_6leadership_follower_multi.json +++ b/tests/results/test_without_family/40_6leadership_follower_multi.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test_without_family/40_6leadership_follower_multi_no_mandatory.json b/tests/results/test_without_family/40_6leadership_follower_multi_no_mandatory.json index e226bccc0..29aa34536 100644 --- a/tests/results/test_without_family/40_6leadership_follower_multi_no_mandatory.json +++ b/tests/results/test_without_family/40_6leadership_follower_multi_no_mandatory.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test_without_family/40_9calculation_variable_leader_follower_multi_inside.json b/tests/results/test_without_family/40_9calculation_variable_leader_follower_multi_inside.json index 94cc000c4..26e752e92 100644 --- a/tests/results/test_without_family/40_9calculation_variable_leader_follower_multi_inside.json +++ b/tests/results/test_without_family/40_9calculation_variable_leader_follower_multi_inside.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-first.json b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-first.json index 87c888bff..b26eaee64 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-first.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-first.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-last.json b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-last.json index 87c888bff..b26eaee64 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-last.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-last.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json index 40cc9aec8..84e34b60b 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-follower-no-mandatory.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-follower.json b/tests/results/test_without_family/40_9leadership-calculation-outside-follower.json index bcf4432ba..db738454b 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-follower.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-follower.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-leader-first.json b/tests/results/test_without_family/40_9leadership-calculation-outside-leader-first.json index d0c97f044..1940f53c1 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-leader-first.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-leader-first.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-leader-last.json b/tests/results/test_without_family/40_9leadership-calculation-outside-leader-last.json index d0c97f044..1940f53c1 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-leader-last.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-leader-last.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_9leadership-calculation-outside-leader.json b/tests/results/test_without_family/40_9leadership-calculation-outside-leader.json index 1c33c94cc..be4e22826 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-outside-leader.json +++ b/tests/results/test_without_family/40_9leadership-calculation-outside-leader.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_9leadership-calculation-variable.json b/tests/results/test_without_family/40_9leadership-calculation-variable.json index 117b044fe..702b6e516 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-variable.json +++ b/tests/results/test_without_family/40_9leadership-calculation-variable.json @@ -30,7 +30,7 @@ "multiple": true }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower.json b/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower.json index 82ac28004..c5903ee2a 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower.json +++ b/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower.json @@ -1,6 +1,6 @@ { "leadership_1": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership_1", "name": "leadership_1", @@ -61,7 +61,7 @@ } }, "leadership_2": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership_2", "name": "leadership_2", diff --git a/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json b/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json index b1c44acc1..4e813e1c6 100644 --- a/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json +++ b/tests/results/test_without_family/40_9leadership-calculation-variable_leader_follower_not_same.json @@ -1,6 +1,6 @@ { "leadership_1": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership_1", "name": "leadership_1", @@ -61,7 +61,7 @@ } }, "leadership_2": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership_2", "name": "leadership_2", diff --git a/tests/results/test_without_family/41_0choice_leader.json b/tests/results/test_without_family/41_0choice_leader.json index 474687e50..a34edfdf4 100644 --- a/tests/results/test_without_family/41_0choice_leader.json +++ b/tests/results/test_without_family/41_0choice_leader.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/44_4disabled_calcultion_follower_index.json b/tests/results/test_without_family/44_4disabled_calcultion_follower_index.json index 2e8bbb1cd..90563495c 100644 --- a/tests/results/test_without_family/44_4disabled_calcultion_follower_index.json +++ b/tests/results/test_without_family/44_4disabled_calcultion_follower_index.json @@ -1,6 +1,6 @@ { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leadership", "name": "leadership", diff --git a/tests/results/test_without_family/44_4leadership_mandatory.json b/tests/results/test_without_family/44_4leadership_mandatory.json index 0f515ec57..e28f2e536 100644 --- a/tests/results/test_without_family/44_4leadership_mandatory.json +++ b/tests/results/test_without_family/44_4leadership_mandatory.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/44_4leadership_mandatory_follower.json b/tests/results/test_without_family/44_4leadership_mandatory_follower.json index ac79d6bef..961427770 100644 --- a/tests/results/test_without_family/44_4leadership_mandatory_follower.json +++ b/tests/results/test_without_family/44_4leadership_mandatory_follower.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/44_5leadership_leader_hidden_calculation.json b/tests/results/test_without_family/44_5leadership_leader_hidden_calculation.json index f95f59970..3a077f511 100644 --- a/tests/results/test_without_family/44_5leadership_leader_hidden_calculation.json +++ b/tests/results/test_without_family/44_5leadership_leader_hidden_calculation.json @@ -20,7 +20,7 @@ "variable_type": "string" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/44_6leadership_follower_disabled_calculation.json b/tests/results/test_without_family/44_6leadership_follower_disabled_calculation.json index 335185afa..d549c92f4 100644 --- a/tests/results/test_without_family/44_6leadership_follower_disabled_calculation.json +++ b/tests/results/test_without_family/44_6leadership_follower_disabled_calculation.json @@ -20,7 +20,7 @@ "variable_type": "string" }, "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results/test_without_family/60_6family_dynamic_leadership.json b/tests/results/test_without_family/60_6family_dynamic_leadership.json index 6dad7734d..b7854d019 100644 --- a/tests/results/test_without_family/60_6family_dynamic_leadership.json +++ b/tests/results/test_without_family/60_6family_dynamic_leadership.json @@ -62,7 +62,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "dyn{{ identifier }}.leadership", "name": "leadership", diff --git a/tests/results/test_without_family/60_6family_dynamic_leadership_empty.json b/tests/results/test_without_family/60_6family_dynamic_leadership_empty.json index 184891933..b7e57a0fb 100644 --- a/tests/results/test_without_family/60_6family_dynamic_leadership_empty.json +++ b/tests/results/test_without_family/60_6family_dynamic_leadership_empty.json @@ -56,7 +56,7 @@ }, "children": { "leadership": { - "type": "leadership", + "type": "sequence", "informations": { "path": "dyn{{ identifier }}.leadership", "name": "leadership", diff --git a/tests/results/test_without_family/68_0family_leadership_mode.json b/tests/results/test_without_family/68_0family_leadership_mode.json index 65e8c5318..1caeebbc3 100644 --- a/tests/results/test_without_family/68_0family_leadership_mode.json +++ b/tests/results/test_without_family/68_0family_leadership_mode.json @@ -1,6 +1,6 @@ { "leader": { - "type": "leadership", + "type": "sequence", "informations": { "path": "leader", "name": "leader", diff --git a/tests/results_tutorial/131/doc.json b/tests/results_tutorial/131/doc.json index c8cdfc8cb..63028886a 100644 --- a/tests/results_tutorial/131/doc.json +++ b/tests/results_tutorial/131/doc.json @@ -474,6 +474,26 @@ "name": "mandatory", "ori_name": "mandatory", "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "variables": [ + { + "path": "proxy_mode", + "description": "Configure Proxy Access to the Internet" + }, + { + "path": "manual.socks_proxy.version", + "description": "SOCKS host version used by proxy" + } + ], + "type": "jinja" + } } ], "mode": "standard", diff --git a/tests/results_tutorial/131/doc.sh b/tests/results_tutorial/131/doc.sh index 097cd85b7..638a872a2 100644 --- a/tests/results_tutorial/131/doc.sh +++ b/tests/results_tutorial/131/doc.sh @@ -174,6 +174,12 @@ │ │ "No proxy". │ ├───────────────────────────────────────┼──────────────────────────────────────┤ │ [1mproxy_dns_socks5[0m │ Use proxy DNS when using SOCKS v5. │ -│ [1;7m boolean [0m [1;7m standard [0m [1;7m mandatory [0m │ [1mDefault[0m: false │ +│ [1;7m boolean [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m │ [1mDefault[0m: false │ +│ [1;3;7mdisabled[0m[1;7m [0m │ [1mDisabled[0m: if "Configure Proxy Access │ +│ │ to the Internet" (proxy_mode) is not │ +│ │ "Manual proxy configuration" │ +│ │ or "SOCKS host version used by │ +│ │ proxy" (manual.socks_proxy.version) │ +│ │ is "v4". │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results_tutorial/131/doc_changelog.sh b/tests/results_tutorial/131/doc_changelog.sh index 8e1df076f..5f19d93d9 100644 --- a/tests/results_tutorial/131/doc_changelog.sh +++ b/tests/results_tutorial/131/doc_changelog.sh @@ -4,6 +4,12 @@ ┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃ ┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ │ [1mproxy_dns_socks5[0m │ Use proxy DNS when using SOCKS v5. │ -│ [1;7m boolean [0m [1;7m standard [0m [1;7m mandatory [0m │ [1mDefault[0m: false │ +│ [1;7m boolean [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m │ [1mDefault[0m: false │ +│ [1;3;7mdisabled[0m[1;7m [0m │ [1mDisabled[0m: if "Configure Proxy Access │ +│ │ to the Internet" (proxy_mode) is not │ +│ │ "Manual proxy configuration" │ +│ │ or "SOCKS host version used by │ +│ │ proxy" (manual.socks_proxy.version) │ +│ │ is "v4". │ └───────────────────────────────────────┴──────────────────────────────────────┘ diff --git a/tests/results_tutorial/132/doc.json b/tests/results_tutorial/132/doc.json deleted file mode 100644 index 63028886a..000000000 --- a/tests/results_tutorial/132/doc.json +++ /dev/null @@ -1,507 +0,0 @@ -{ - "proxy_mode": { - "path": "proxy_mode", - "name": "proxy_mode", - "description": "Configure Proxy Access to the Internet.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "No proxy" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "No proxy", - "Auto-detect proxy settings for this network", - "Use system proxy settings", - "Manual proxy configuration", - "Automatic proxy configuration URL" - ] - } - }, - "manual": { - "type": "family", - "informations": { - "path": "manual", - "name": "manual", - "description": "Manual proxy configuration", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Manual proxy configuration\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic" - }, - "children": { - "http_proxy": { - "type": "family", - "informations": { - "path": "manual.http_proxy", - "name": "http_proxy", - "description": "HTTP Proxy", - "properties": [], - "mode": "basic" - }, - "children": { - "address": { - "path": "manual.http_proxy.address", - "name": "address", - "description": "HTTP proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.http_proxy.port", - "name": "port", - "description": "HTTP proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "8080" - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "use_for_https": { - "path": "manual.use_for_https", - "name": "use_for_https", - "description": "Also use this proxy for HTTPS.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" - }, - "https_proxy": { - "type": "family", - "informations": { - "path": "manual.https_proxy", - "name": "https_proxy", - "description": "HTTPS Proxy", - "properties": [ - { - "type": "property", - "name": "hidden", - "ori_name": "hidden", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"true\".", - "path": { - "path": "manual.use_for_https" - }, - "description": "Also use this proxy for HTTPS" - } - } - ], - "mode": "standard" - }, - "children": { - "address": { - "path": "manual.https_proxy.address", - "name": "address", - "description": "HTTPS proxy address.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.address", - "type": "variable" - }, - "description": "HTTP proxy address" - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.https_proxy.port", - "name": "port", - "description": "HTTPS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "message": "the value of the variable {0}.", - "path": { - "path": "manual.http_proxy.port", - "type": "variable" - }, - "description": "HTTP proxy port" - } - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - } - } - }, - "socks_proxy": { - "type": "family", - "informations": { - "path": "manual.socks_proxy", - "name": "socks_proxy", - "description": "SOCKS Proxy", - "properties": [], - "mode": "standard" - }, - "children": { - "address": { - "path": "manual.socks_proxy.address", - "name": "address", - "description": "SOCKS proxy address.", - "properties": [], - "mode": "standard", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "manual.socks_proxy.port", - "name": "port", - "description": "SOCKS proxy port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"null\".", - "path": { - "path": "manual.socks_proxy.address" - }, - "description": "SOCKS proxy address" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "1080" - }, - "variable_type": "port", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "private ports (greater than 49152) are allowed" - ] - } - }, - "version": { - "path": "manual.socks_proxy.version", - "name": "version", - "description": "SOCKS host version used by proxy.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"null\".", - "path": { - "path": "manual.socks_proxy.address" - }, - "description": "SOCKS proxy address" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "v5" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "v4", - "v5" - ] - } - } - } - } - } - }, - "auto": { - "path": "auto", - "name": "auto", - "description": "Automatic proxy configuration URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} hasn't the value \"Automatic proxy configuration URL\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "basic", - "type": "variable", - "variable_type": "web address", - "validators": { - "name": "Validators", - "values": [ - "well-known ports (1 to 1023) are allowed", - "registred ports (1024 to 49151) are allowed", - "type domainname", - "the domain name can be a hostname" - ] - } - }, - "no_proxy": { - "path": "no_proxy", - "name": "no_proxy", - "description": "Address for which proxy will be desactivated.", - "help": [ - "Connections to localhost, 127.0.0.1/8 and ::1 are never proxied." - ], - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - }, - { - "type": "property", - "name": "unique", - "ori_name": "unique", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can starts by a dot", - "the domain name can be a hostname", - "the domain name can be an IP", - "the domain name can be network in CIDR format" - ] - }, - "multiple": true, - "examples": { - "name": "Examples", - "values": [ - ".mozilla.org", - ".net.nz", - "192.168.1.0/24" - ] - } - }, - "prompt_authentication": { - "path": "prompt_authentication", - "name": "prompt_authentication", - "description": "Prompt for authentication if password is saved.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "message": "when the variable {0} has the value \"No proxy\".", - "path": { - "path": "proxy_mode" - }, - "description": "Configure Proxy Access to the Internet" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": true - }, - "variable_type": "boolean" - }, - "proxy_dns_socks5": { - "path": "proxy_dns_socks5", - "name": "proxy_dns_socks5", - "description": "Use proxy DNS when using SOCKS v5.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", - "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, - { - "path": "manual.socks_proxy.version", - "description": "SOCKS host version used by proxy" - } - ], - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": false - }, - "variable_type": "boolean" - } -} \ No newline at end of file diff --git a/tests/results_tutorial/132/doc.sh b/tests/results_tutorial/132/doc.sh deleted file mode 100644 index 638a872a2..000000000 --- a/tests/results_tutorial/132/doc.sh +++ /dev/null @@ -1,185 +0,0 @@ -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ [1mproxy_mode[0m │ Configure Proxy Access to the │ -│ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m │ Internet. │ -│ │ [1mChoices[0m: │ -│ │ • No proxy [1m← (default)[0m │ -│ │ • Auto-detect proxy settings for │ -│ │ this network │ -│ │ • Use system proxy settings │ -│ │ • Manual proxy configuration │ -│ │ • Automatic proxy configuration URL │ -└───────────────────────────────────────┴──────────────────────────────────────┘ - -[1;4;96mManual proxy configuration[0m - -[34m▌ [0m[1;34m🛈 Informations[0m -[34m▌ [0m -[34m▌ [0m[1mPath[0m: manual -[34m▌ [0m[1;7m basic [0m [1;7m [0m[1;3;7mdisabled[0m[1;7m [0m -[34m▌ [0m[1mDisabled[0m: when the variable [32m"Configure Proxy Access to the Internet"[0m -[34m▌ [0m[1m([0mproxy_mode[1m)[0m hasn't the value [32m"Manual proxy configuration"[0m. - - [1;4;92mHTTP Proxy[0m - -[34m▌ [0m[1;34m🛈 Informations[0m -[34m▌ [0m -[34m▌ [0m[1mPath[0m: manual.http_proxy -[34m▌ [0m[1;7m basic [0m - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ [1mmanual.http_proxy.address[0m │ HTTP proxy address. │ -│ [1;7m domainname [0m [1;7m basic [0m [1;7m mandatory [0m │ [1mValidators[0m: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -├───────────────────────────────────────┼──────────────────────────────────────┤ -│ [1mmanual.http_proxy.port[0m │ HTTP proxy port. │ -│ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m │ [1mValidators[0m: │ -│ │ • well-known ports (1 to 1023) are │ -│ │ allowed │ -│ │ • registred ports (1024 to 49151) │ -│ │ are allowed │ -│ │ • private ports (greater than 49152) │ -│ │ are allowed │ -│ │ [1mDefault[0m: 8080 │ -└───────────────────────────────────────┴──────────────────────────────────────┘ - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ [1mmanual.use_for_https[0m │ Also use this proxy for HTTPS. │ -│ [1;7m boolean [0m [1;7m standard [0m [1;7m mandatory [0m │ [1mDefault[0m: true │ -└───────────────────────────────────────┴──────────────────────────────────────┘ - - [1;4;92mHTTPS Proxy[0m - -[34m▌ [0m[1;34m🛈 Informations[0m -[34m▌ [0m -[34m▌ [0m[1mPath[0m: manual.https_proxy -[34m▌ [0m[1;7m standard [0m [1;7m [0m[1;3;7mhidden[0m[1;7m [0m -[34m▌ [0m[1mHidden[0m: when the variable [32m"Also use this proxy for HTTPS"[0m -[34m▌ [0m[1m([0mmanual.use_for_https[1m)[0m has the value [32m"true"[0m. - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ [1mmanual.https_proxy.address[0m │ HTTPS proxy address. │ -│ [1;7m domainname [0m [1;7m standard [0m [1;7m mandatory [0m │ [1mValidators[0m: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -│ │ [1mDefault[0m: the value of the variable │ -│ │ "HTTP proxy address" │ -│ │ (manual.http_proxy.address). │ -├───────────────────────────────────────┼──────────────────────────────────────┤ -│ [1mmanual.https_proxy.port[0m │ HTTPS proxy port. │ -│ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m │ [1mValidators[0m: │ -│ │ • well-known ports (1 to 1023) are │ -│ │ allowed │ -│ │ • registred ports (1024 to 49151) │ -│ │ are allowed │ -│ │ • private ports (greater than 49152) │ -│ │ are allowed │ -│ │ [1mDefault[0m: the value of the variable │ -│ │ "HTTP proxy port" │ -│ │ (manual.http_proxy.port). │ -└───────────────────────────────────────┴──────────────────────────────────────┘ - - [1;4;92mSOCKS Proxy[0m - -[34m▌ [0m[1;34m🛈 Informations[0m -[34m▌ [0m -[34m▌ [0m[1mPath[0m: manual.socks_proxy -[34m▌ [0m[1;7m standard [0m - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ [1mmanual.socks_proxy.address[0m │ SOCKS proxy address. │ -│ [1;7m domainname [0m [1;7m standard [0m │ [1mValidators[0m: │ -│ │ • type domainname │ -│ │ • the domain name can be an IP │ -├───────────────────────────────────────┼──────────────────────────────────────┤ -│ [1mmanual.socks_proxy.port[0m │ SOCKS proxy port. │ -│ [1;7m port [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m │ [1mValidators[0m: │ -│ [1;3;7mdisabled[0m[1;7m [0m │ • well-known ports (1 to 1023) are │ -│ │ allowed │ -│ │ • registred ports (1024 to 49151) │ -│ │ are allowed │ -│ │ • private ports (greater than 49152) │ -│ │ are allowed │ -│ │ [1mDefault[0m: 1080 │ -│ │ [1mDisabled[0m: when the variable "SOCKS │ -│ │ proxy address" │ -│ │ (manual.socks_proxy.address) has the │ -│ │ value "null". │ -├───────────────────────────────────────┼──────────────────────────────────────┤ -│ [1mmanual.socks_proxy.version[0m │ SOCKS host version used by proxy. │ -│ [1;7m choice [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m │ [1mChoices[0m: │ -│ [1;3;7mdisabled[0m[1;7m [0m │ • v4 │ -│ │ • v5 [1m← (default)[0m │ -│ │ [1mDisabled[0m: when the variable "SOCKS │ -│ │ proxy address" │ -│ │ (manual.socks_proxy.address) has the │ -│ │ value "null". │ -└───────────────────────────────────────┴──────────────────────────────────────┘ - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ [1mauto[0m │ Automatic proxy configuration URL. │ -│ [1;7m web address [0m [1;7m basic [0m [1;7m mandatory [0m [1;7m [0m │ [1mValidators[0m: │ -│ [1;3;7mdisabled[0m[1;7m [0m │ • well-known ports (1 to 1023) are │ -│ │ allowed │ -│ │ • registred ports (1024 to 49151) │ -│ │ are allowed │ -│ │ • type domainname │ -│ │ • the domain name can be a hostname │ -│ │ [1mDisabled[0m: when the variable │ -│ │ "Configure Proxy Access to the │ -│ │ Internet" (proxy_mode) hasn't the │ -│ │ value "Automatic proxy configuration │ -│ │ URL". │ -├───────────────────────────────────────┼──────────────────────────────────────┤ -│ [1mno_proxy[0m │ Address for which proxy will be │ -│ [1;7m domainname [0m [1;7m multiple [0m [1;7m standard [0m [1;7m [0m │ desactivated. │ -│ [1;3;7mdisabled[0m[1;7m [0m [1;7m unique [0m │ Connections to localhost, │ -│ │ 127.0.0.1/8 and ::1 are never │ -│ │ proxied. │ -│ │ [1mValidators[0m: │ -│ │ • type domainname │ -│ │ • the domain name can starts by a │ -│ │ dot │ -│ │ • the domain name can be a hostname │ -│ │ • the domain name can be an IP │ -│ │ • the domain name can be network in │ -│ │ CIDR format │ -│ │ [1mExamples[0m: │ -│ │ • .mozilla.org │ -│ │ • .net.nz │ -│ │ • 192.168.1.0/24 │ -│ │ [1mDisabled[0m: when the variable │ -│ │ "Configure Proxy Access to the │ -│ │ Internet" (proxy_mode) has the value │ -│ │ "No proxy". │ -├───────────────────────────────────────┼──────────────────────────────────────┤ -│ [1mprompt_authentication[0m │ Prompt for authentication if │ -│ [1;7m boolean [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m │ password is saved. │ -│ [1;3;7mdisabled[0m[1;7m [0m │ [1mDefault[0m: true │ -│ │ [1mDisabled[0m: when the variable │ -│ │ "Configure Proxy Access to the │ -│ │ Internet" (proxy_mode) has the value │ -│ │ "No proxy". │ -├───────────────────────────────────────┼──────────────────────────────────────┤ -│ [1mproxy_dns_socks5[0m │ Use proxy DNS when using SOCKS v5. │ -│ [1;7m boolean [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m │ [1mDefault[0m: false │ -│ [1;3;7mdisabled[0m[1;7m [0m │ [1mDisabled[0m: if "Configure Proxy Access │ -│ │ to the Internet" (proxy_mode) is not │ -│ │ "Manual proxy configuration" │ -│ │ or "SOCKS host version used by │ -│ │ proxy" (manual.socks_proxy.version) │ -│ │ is "v4". │ -└───────────────────────────────────────┴──────────────────────────────────────┘ - diff --git a/tests/results_tutorial/132/doc_changelog.sh b/tests/results_tutorial/132/doc_changelog.sh deleted file mode 100644 index a90576c8a..000000000 --- a/tests/results_tutorial/132/doc_changelog.sh +++ /dev/null @@ -1,15 +0,0 @@ -[1;4;96mModified variable[0m - -┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ -┃[1m [0m[1mVariable [0m[1m [0m┃[1m [0m[1mDescription [0m[1m [0m┃ -┡━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━╇━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┩ -│ [1mproxy_dns_socks5[0m │ Use proxy DNS when using SOCKS v5. │ -│ [1;7m boolean [0m [1;7m standard [0m [1;7m mandatory [0m [1;7m [0m │ [1mDefault[0m: false │ -│ [1;3;4;7mdisabled[0m[1;7m [0m │ [1mDisabled[0m: [4mif "Configure Proxy Access[0m │ -│ │ [4mto the Internet" (proxy_mode) is not[0m │ -│ │ [4m"Manual proxy configuration"[0m │ -│ │ [4mor "SOCKS host version used by [0m │ -│ │ [4mproxy" (manual.socks_proxy.version) [0m │ -│ │ [4mis "v4".[0m │ -└───────────────────────────────────────┴──────────────────────────────────────┘ - diff --git a/tests/results_tutorial/190/doc.json b/tests/results_tutorial/190/doc.json index 70de6e485..0b0279d50 100644 --- a/tests/results_tutorial/190/doc.json +++ b/tests/results_tutorial/190/doc.json @@ -651,7 +651,7 @@ }, "children": { "proxies": { - "type": "leadership", + "type": "sequence", "informations": { "path": "foxyproxy.proxies", "name": "proxies", diff --git a/tests/results_tutorial/200/doc.json b/tests/results_tutorial/200/doc.json index b3bc314fd..0d1bde103 100644 --- a/tests/results_tutorial/200/doc.json +++ b/tests/results_tutorial/200/doc.json @@ -651,7 +651,7 @@ }, "children": { "proxies": { - "type": "leadership", + "type": "sequence", "informations": { "path": "foxyproxy.proxies", "name": "proxies", diff --git a/tests/results_tutorial/201/doc.json b/tests/results_tutorial/201/doc.json index 1b4e2be5f..713102c4d 100644 --- a/tests/results_tutorial/201/doc.json +++ b/tests/results_tutorial/201/doc.json @@ -651,7 +651,7 @@ }, "children": { "proxies": { - "type": "leadership", + "type": "sequence", "informations": { "path": "foxyproxy.proxies", "name": "proxies", diff --git a/tests/results_tutorial/202/doc.json b/tests/results_tutorial/202/doc.json index 0baaf2257..d4c5d84d8 100644 --- a/tests/results_tutorial/202/doc.json +++ b/tests/results_tutorial/202/doc.json @@ -651,7 +651,7 @@ }, "children": { "proxies": { - "type": "leadership", + "type": "sequence", "informations": { "path": "foxyproxy.proxies", "name": "proxies", diff --git a/tests/results_tutorial/210/doc.json b/tests/results_tutorial/210/doc.json index 1cdef4b81..42222e6c8 100644 --- a/tests/results_tutorial/210/doc.json +++ b/tests/results_tutorial/210/doc.json @@ -651,7 +651,7 @@ }, "children": { "proxies": { - "type": "leadership", + "type": "sequence", "informations": { "path": "foxyproxy.proxies", "name": "proxies", diff --git a/tests/results_tutorial/220/doc.json b/tests/results_tutorial/220/doc.json index 39e7ca771..951aae8f2 100644 --- a/tests/results_tutorial/220/doc.json +++ b/tests/results_tutorial/220/doc.json @@ -651,7 +651,7 @@ }, "children": { "proxies": { - "type": "leadership", + "type": "sequence", "informations": { "path": "foxyproxy.proxies", "name": "proxies", diff --git a/tests/results_tutorial/230/doc.json b/tests/results_tutorial/230/doc.json index e68662b6f..b39ccf21a 100644 --- a/tests/results_tutorial/230/doc.json +++ b/tests/results_tutorial/230/doc.json @@ -651,7 +651,7 @@ }, "children": { "proxies": { - "type": "leadership", + "type": "sequence", "informations": { "path": "foxyproxy.proxies", "name": "proxies", diff --git a/tests/results_tutorial/231/doc.json b/tests/results_tutorial/231/doc.json index b3ac55a7e..0af36ce07 100644 --- a/tests/results_tutorial/231/doc.json +++ b/tests/results_tutorial/231/doc.json @@ -651,7 +651,7 @@ }, "children": { "proxies": { - "type": "leadership", + "type": "sequence", "informations": { "path": "foxyproxy.proxies", "name": "proxies",