From 782c2eac80fe3b109150d8d118187d7b2941602b Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Mon, 15 Jun 2026 09:16:59 +0200 Subject: [PATCH] fix: update tests --- tests/force_optional.adoc | 4 +- .../test/60_0family_dynamic_variable.adoc | 33 +++ .../60_0family_dynamic_variable.gitlab.md | 22 ++ .../test/60_0family_dynamic_variable.html | 23 ++ .../test/60_0family_dynamic_variable.json | 91 +++++++ .../test/60_0family_dynamic_variable.md | 19 ++ .../test/60_0family_dynamic_variable.sh | 28 +++ .../test/warnings_60_0family_dynamic_variable | 1 + .../60_0family_dynamic_variable.adoc | 25 ++ .../60_0family_dynamic_variable.gitlab.md | 26 ++ .../60_0family_dynamic_variable.html | 18 ++ .../60_0family_dynamic_variable.md | 22 ++ .../60_0family_dynamic_variable.sh | 19 ++ .../warnings_60_0family_dynamic_variable | 1 + .../60_0family_dynamic_variable.adoc | 25 ++ .../60_0family_dynamic_variable.gitlab.md | 26 ++ .../60_0family_dynamic_variable.html | 18 ++ .../60_0family_dynamic_variable.md | 22 ++ .../60_0family_dynamic_variable.sh | 19 ++ .../warnings_60_0family_dynamic_variable | 1 + .../60_0family_dynamic_variable.adoc | 44 ++++ .../60_0family_dynamic_variable.gitlab.md | 33 +++ .../60_0family_dynamic_variable.html | 27 +++ .../60_0family_dynamic_variable.json | 106 +++++++++ .../60_0family_dynamic_variable.md | 27 +++ .../60_0family_dynamic_variable.sh | 36 +++ .../warnings_60_0family_dynamic_variable | 1 + .../60_0family_dynamic_variable.adoc | 27 +++ .../60_0family_dynamic_variable.gitlab.md | 28 +++ .../60_0family_dynamic_variable.html | 20 ++ .../60_0family_dynamic_variable.md | 24 ++ .../60_0family_dynamic_variable.sh | 21 ++ .../warnings_60_0family_dynamic_variable | 1 + .../60_0family_dynamic_variable.adoc | 27 +++ .../60_0family_dynamic_variable.gitlab.md | 28 +++ .../60_0family_dynamic_variable.html | 20 ++ .../60_0family_dynamic_variable.md | 24 ++ .../60_0family_dynamic_variable.sh | 21 ++ .../warnings_60_0family_dynamic_variable | 1 + .../60_0family_dynamic_variable.adoc | 13 + ...60_0family_dynamic_variable.changelog.adoc | 15 ++ ...amily_dynamic_variable.changelog.gitlab.md | 8 + ...60_0family_dynamic_variable.changelog.html | 12 + .../60_0family_dynamic_variable.changelog.md | 6 + .../60_0family_dynamic_variable.changelog.sh | 15 ++ .../60_0family_dynamic_variable.gitlab.md | 4 + .../60_0family_dynamic_variable.html | 10 + .../60_0family_dynamic_variable.json | 106 +++++++++ .../60_0family_dynamic_variable.md | 4 + .../60_0family_dynamic_variable.sh | 13 + .../warnings_60_0family_dynamic_variable | 1 + .../60_0family_dynamic_variable.adoc | 13 + ...60_0family_dynamic_variable.changelog.adoc | 15 ++ ...amily_dynamic_variable.changelog.gitlab.md | 8 + ...60_0family_dynamic_variable.changelog.html | 12 + .../60_0family_dynamic_variable.changelog.md | 6 + .../60_0family_dynamic_variable.changelog.sh | 15 ++ .../60_0family_dynamic_variable.gitlab.md | 4 + .../60_0family_dynamic_variable.html | 10 + .../60_0family_dynamic_variable.json | 91 +++++++ .../60_0family_dynamic_variable.md | 4 + .../60_0family_dynamic_variable.sh | 13 + .../warnings_60_0family_dynamic_variable | 1 + tests/results_tutorial/140/doc.json | 6 +- tests/results_tutorial/140/doc.sh | 10 +- tests/results_tutorial/140/doc_changelog.sh | 18 ++ tests/results_tutorial/150/doc.json | 6 +- tests/results_tutorial/150/doc.sh | 10 +- tests/results_tutorial/150/doc_changelog.sh | 10 +- tests/results_tutorial/160/doc.json | 6 +- tests/results_tutorial/160/doc.sh | 10 +- tests/results_tutorial/161/doc.json | 6 +- tests/results_tutorial/161/doc.sh | 10 +- tests/results_tutorial/162/doc.json | 6 +- tests/results_tutorial/162/doc.sh | 10 +- tests/results_tutorial/170/doc.json | 6 +- tests/results_tutorial/170/doc.sh | 10 +- tests/results_tutorial/180/doc.json | 6 +- tests/results_tutorial/180/doc.sh | 10 +- tests/results_tutorial/180/doc_changelog.sh | 10 +- tests/results_tutorial/181/doc.json | 6 +- tests/results_tutorial/181/doc.sh | 10 +- tests/results_tutorial/190/doc.json | 6 +- tests/results_tutorial/190/doc.sh | 10 +- tests/results_tutorial/200/doc.json | 6 +- tests/results_tutorial/200/doc.sh | 10 +- tests/results_tutorial/201/doc.json | 6 +- tests/results_tutorial/201/doc.sh | 10 +- tests/results_tutorial/202/doc_changelog.sh | 12 - tests/results_tutorial/210/doc.json | 39 +-- tests/results_tutorial/210/doc.sh | 21 +- tests/results_tutorial/210/doc_changelog.sh | 17 +- tests/results_tutorial/220/doc.json | 139 +---------- tests/results_tutorial/220/doc.sh | 53 +---- tests/results_tutorial/220/doc_changelog.sh | 54 +---- tests/results_tutorial/230/doc.json | 56 +---- tests/results_tutorial/230/doc.sh | 25 +- tests/results_tutorial/230/doc_changelog.sh | 38 ++- tests/results_tutorial/{202 => 240}/doc.json | 225 +++++++++++++++++- tests/results_tutorial/{202 => 240}/doc.sh | 82 ++++++- tests/results_tutorial/240/doc_changelog.sh | 24 ++ tests/results_tutorial/{231 => 241}/doc.json | 11 +- tests/results_tutorial/{231 => 241}/doc.sh | 10 +- .../{231 => 241}/doc_changelog.sh | 7 +- 104 files changed, 1825 insertions(+), 560 deletions(-) create mode 100644 tests/results/test/60_0family_dynamic_variable.adoc create mode 100644 tests/results/test/60_0family_dynamic_variable.gitlab.md create mode 100644 tests/results/test/60_0family_dynamic_variable.html create mode 100644 tests/results/test/60_0family_dynamic_variable.json create mode 100644 tests/results/test/60_0family_dynamic_variable.md create mode 100644 tests/results/test/60_0family_dynamic_variable.sh create mode 100644 tests/results/test/warnings_60_0family_dynamic_variable create mode 100644 tests/results/test_examples/60_0family_dynamic_variable.adoc create mode 100644 tests/results/test_examples/60_0family_dynamic_variable.gitlab.md create mode 100644 tests/results/test_examples/60_0family_dynamic_variable.html create mode 100644 tests/results/test_examples/60_0family_dynamic_variable.md create mode 100644 tests/results/test_examples/60_0family_dynamic_variable.sh create mode 100644 tests/results/test_examples/warnings_60_0family_dynamic_variable create mode 100644 tests/results/test_examples_comment/60_0family_dynamic_variable.adoc create mode 100644 tests/results/test_examples_comment/60_0family_dynamic_variable.gitlab.md create mode 100644 tests/results/test_examples_comment/60_0family_dynamic_variable.html create mode 100644 tests/results/test_examples_comment/60_0family_dynamic_variable.md create mode 100644 tests/results/test_examples_comment/60_0family_dynamic_variable.sh create mode 100644 tests/results/test_examples_comment/warnings_60_0family_dynamic_variable create mode 100644 tests/results/test_namespace/60_0family_dynamic_variable.adoc create mode 100644 tests/results/test_namespace/60_0family_dynamic_variable.gitlab.md create mode 100644 tests/results/test_namespace/60_0family_dynamic_variable.html create mode 100644 tests/results/test_namespace/60_0family_dynamic_variable.json create mode 100644 tests/results/test_namespace/60_0family_dynamic_variable.md create mode 100644 tests/results/test_namespace/60_0family_dynamic_variable.sh create mode 100644 tests/results/test_namespace/warnings_60_0family_dynamic_variable create mode 100644 tests/results/test_namespace_examples/60_0family_dynamic_variable.adoc create mode 100644 tests/results/test_namespace_examples/60_0family_dynamic_variable.gitlab.md create mode 100644 tests/results/test_namespace_examples/60_0family_dynamic_variable.html create mode 100644 tests/results/test_namespace_examples/60_0family_dynamic_variable.md create mode 100644 tests/results/test_namespace_examples/60_0family_dynamic_variable.sh create mode 100644 tests/results/test_namespace_examples/warnings_60_0family_dynamic_variable create mode 100644 tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.adoc create mode 100644 tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.gitlab.md create mode 100644 tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.html create mode 100644 tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.md create mode 100644 tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.sh create mode 100644 tests/results/test_namespace_examples_comment/warnings_60_0family_dynamic_variable create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.adoc create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.adoc create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.gitlab.md create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.html create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.md create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.sh create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.gitlab.md create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.html create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.json create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.md create mode 100644 tests/results/test_namespace_without_family/60_0family_dynamic_variable.sh create mode 100644 tests/results/test_namespace_without_family/warnings_60_0family_dynamic_variable create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.adoc create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.changelog.adoc create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.changelog.gitlab.md create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.changelog.html create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.changelog.md create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.changelog.sh create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.gitlab.md create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.html create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.json create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.md create mode 100644 tests/results/test_without_family/60_0family_dynamic_variable.sh create mode 100644 tests/results/test_without_family/warnings_60_0family_dynamic_variable delete mode 100644 tests/results_tutorial/202/doc_changelog.sh rename tests/results_tutorial/{202 => 240}/doc.json (75%) rename tests/results_tutorial/{202 => 240}/doc.sh (77%) create mode 100644 tests/results_tutorial/240/doc_changelog.sh rename tests/results_tutorial/{231 => 241}/doc.json (99%) rename tests/results_tutorial/{231 => 241}/doc.sh (98%) rename tests/results_tutorial/{231 => 241}/doc_changelog.sh (86%) diff --git a/tests/force_optional.adoc b/tests/force_optional.adoc index fbd13ea31..4c248dd51 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/60_0family_dynamic_variable.adoc b/tests/results/test/60_0family_dynamic_variable.adoc new file mode 100644 index 000000000..4e555feae --- /dev/null +++ b/tests/results/test/60_0family_dynamic_variable.adoc @@ -0,0 +1,33 @@ +[cols="1a,1a"] +|==== +| Variable | Description +| **var** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `multiple` `standard` `mandatory` `unique` | A suffix variable. + +**Default**: + +* val1 +* val2 +|==== + +== A dynamic family + +==== +**๐Ÿ›ˆ Informations** + +This family builds families dynamically. + +**Path**: + +* dyn__val1__ +* dyn__val2__ + +`basic` + +**Identifiers**: the value of the variable "A suffix variable" (var). + +==== + +[cols="1a,1a"] +|==== +| Variable | Description +| **dyn__val1__.variable** + +**dyn__val2__.variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | A dynamic variable. +|==== \ No newline at end of file diff --git a/tests/results/test/60_0family_dynamic_variable.gitlab.md b/tests/results/test/60_0family_dynamic_variable.gitlab.md new file mode 100644 index 000000000..cbfd30d8a --- /dev/null +++ b/tests/results/test/60_0family_dynamic_variable.gitlab.md @@ -0,0 +1,22 @@ +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | + +
A dynamic family + +> [!note] ๐Ÿ›ˆ Informations +> This family builds families dynamically. +> +> **Path**: +> - dyn*val1* +> - dyn*val2* +> +> `basic` +> +> **Identifiers**: the value of the variable "[A suffix variable](#var)". + +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------| +| **dyn*val1*.variable**
**dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | + +
\ No newline at end of file diff --git a/tests/results/test/60_0family_dynamic_variable.html b/tests/results/test/60_0family_dynamic_variable.html new file mode 100644 index 000000000..8efbcc645 --- /dev/null +++ b/tests/results/test/60_0family_dynamic_variable.html @@ -0,0 +1,23 @@ + + + + + + + +
Variable Description
var
string multiple standard mandatory unique
A suffix variable.
Default:
  • val1
  • +
  • val2
+ +

A dynamic family

+ +This family builds families dynamically.
Path:
basic
Identifiers: the value of the variable "A suffix variable" (var). + + + + + + + + +
Variable Description
dynval1.variable
dynval2.variable
string basic mandatory
A dynamic variable.
\ No newline at end of file diff --git a/tests/results/test/60_0family_dynamic_variable.json b/tests/results/test/60_0family_dynamic_variable.json new file mode 100644 index 000000000..3f94576cd --- /dev/null +++ b/tests/results/test/60_0family_dynamic_variable.json @@ -0,0 +1,91 @@ +{ + "var": { + "path": "var", + "name": "var", + "description": "A suffix variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, + "variable_type": "string", + "multiple": true + }, + "dyn{{ identifier }}": { + "type": "dynamic", + "informations": { + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "identifier_type": "many", + "help": [ + "This family builds families dynamically" + ], + "identifier": [ + { + "message": "the value of the variable {0}.", + "path": { + "path": "var", + "type": "variable" + }, + "description": "A suffix variable" + } + ] + }, + "children": { + "variable": { + "path": "dyn{{ identifier }}.variable", + "name": "variable", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "identifier_type": "many", + "type": "variable", + "variable_type": "string" + } + } + } +} \ No newline at end of file diff --git a/tests/results/test/60_0family_dynamic_variable.md b/tests/results/test/60_0family_dynamic_variable.md new file mode 100644 index 000000000..08b15eda5 --- /dev/null +++ b/tests/results/test/60_0family_dynamic_variable.md @@ -0,0 +1,19 @@ +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | + +# A dynamic family + +> [!NOTE] +> +> This family builds families dynamically.\ +> **Path**: \ +> - dyn*val1*\ + +> - dyn*val2*\ +> `basic`\ +> **Identifiers**: the value of the variable "[A suffix variable](#var)". + +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------| +| **dyn*val1*.variable**
**dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | \ No newline at end of file diff --git a/tests/results/test/60_0family_dynamic_variable.sh b/tests/results/test/60_0family_dynamic_variable.sh new file mode 100644 index 000000000..98d76d1fa --- /dev/null +++ b/tests/results/test/60_0family_dynamic_variable.sh @@ -0,0 +1,28 @@ +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ var โ”‚ A suffix variable. โ”‚ +โ”‚  string   multiple   standard    โ”‚ Default: โ”‚ +โ”‚ mandatory   unique  โ”‚ โ€ข val1 โ”‚ +โ”‚ โ”‚ โ€ข val2 โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + +A dynamic family + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family builds families dynamically. +โ–Œ Path: +โ–Œ  โ€ข dynval1 +โ–Œ  โ€ข dynval2 +โ–Œ  basic  +โ–Œ Identifiers: the value of the variable "A suffix variable" (var). + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ dynval1.variable โ”‚ A dynamic variable. โ”‚ +โ”‚ dynval2.variable โ”‚ โ”‚ +โ”‚  string   basic   mandatory  โ”‚ โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/results/test/warnings_60_0family_dynamic_variable b/tests/results/test/warnings_60_0family_dynamic_variable new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/results/test/warnings_60_0family_dynamic_variable @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/results/test_examples/60_0family_dynamic_variable.adoc b/tests/results/test_examples/60_0family_dynamic_variable.adoc new file mode 100644 index 000000000..52bffcce9 --- /dev/null +++ b/tests/results/test_examples/60_0family_dynamic_variable.adoc @@ -0,0 +1,25 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +dynval1: + variable: example +dynval2: + variable: example +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +var: + - val1 + - val2 +dynval1: + variable: example +dynval2: + variable: example +---- diff --git a/tests/results/test_examples/60_0family_dynamic_variable.gitlab.md b/tests/results/test_examples/60_0family_dynamic_variable.gitlab.md new file mode 100644 index 000000000..6f9f9eaf5 --- /dev/null +++ b/tests/results/test_examples/60_0family_dynamic_variable.gitlab.md @@ -0,0 +1,26 @@ +
Example with mandatory variables not filled in + +```yaml +--- +dynval1: + variable: example +dynval2: + variable: example +``` + +
+ +
Example with all variables modifiable + +```yaml +--- +var: + - val1 + - val2 +dynval1: + variable: example +dynval2: + variable: example +``` + +
\ No newline at end of file diff --git a/tests/results/test_examples/60_0family_dynamic_variable.html b/tests/results/test_examples/60_0family_dynamic_variable.html new file mode 100644 index 000000000..7f49476e3 --- /dev/null +++ b/tests/results/test_examples/60_0family_dynamic_variable.html @@ -0,0 +1,18 @@ +

Example with mandatory variables not filled in

+ +
---
+dynval1:
+  variable: example
+dynval2:
+  variable: example
+ +

Example with all variables modifiable

+ +
---
+var:
+  - val1
+  - val2
+dynval1:
+  variable: example
+dynval2:
+  variable: example
\ No newline at end of file diff --git a/tests/results/test_examples/60_0family_dynamic_variable.md b/tests/results/test_examples/60_0family_dynamic_variable.md new file mode 100644 index 000000000..c3e17af8e --- /dev/null +++ b/tests/results/test_examples/60_0family_dynamic_variable.md @@ -0,0 +1,22 @@ +# Example with mandatory variables not filled in + +```yaml +--- +dynval1: + variable: example +dynval2: + variable: example +``` + +# Example with all variables modifiable + +```yaml +--- +var: + - val1 + - val2 +dynval1: + variable: example +dynval2: + variable: example +``` \ No newline at end of file diff --git a/tests/results/test_examples/60_0family_dynamic_variable.sh b/tests/results/test_examples/60_0family_dynamic_variable.sh new file mode 100644 index 000000000..e0fc42113 --- /dev/null +++ b/tests/results/test_examples/60_0family_dynamic_variable.sh @@ -0,0 +1,19 @@ +Example with mandatory variables not filled in + +---  +dynval1:  + variable: example  +dynval2:  + variable: example  + +Example with all variables modifiable + +---  +var:  + - val1  + - val2  +dynval1:  + variable: example  +dynval2:  + variable: example  + diff --git a/tests/results/test_examples/warnings_60_0family_dynamic_variable b/tests/results/test_examples/warnings_60_0family_dynamic_variable new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/results/test_examples/warnings_60_0family_dynamic_variable @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable.adoc b/tests/results/test_examples_comment/60_0family_dynamic_variable.adoc new file mode 100644 index 000000000..07ef7bc81 --- /dev/null +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable.adoc @@ -0,0 +1,25 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +dynval1: # A dynamic family + variable: example # A dynamic variable +dynval2: # A dynamic family + variable: example # A dynamic variable +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +var: # A suffix variable + - val1 + - val2 +dynval1: # A dynamic family + variable: example # A dynamic variable +dynval2: # A dynamic family + variable: example # A dynamic variable +---- diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable.gitlab.md b/tests/results/test_examples_comment/60_0family_dynamic_variable.gitlab.md new file mode 100644 index 000000000..9152298dc --- /dev/null +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable.gitlab.md @@ -0,0 +1,26 @@ +
Example with mandatory variables not filled in + +```yaml +--- +dynval1: # A dynamic family + variable: example # A dynamic variable +dynval2: # A dynamic family + variable: example # A dynamic variable +``` + +
+ +
Example with all variables modifiable + +```yaml +--- +var: # A suffix variable + - val1 + - val2 +dynval1: # A dynamic family + variable: example # A dynamic variable +dynval2: # A dynamic family + variable: example # A dynamic variable +``` + +
\ No newline at end of file diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable.html b/tests/results/test_examples_comment/60_0family_dynamic_variable.html new file mode 100644 index 000000000..e55bbbbe3 --- /dev/null +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable.html @@ -0,0 +1,18 @@ +

Example with mandatory variables not filled in

+ +
---
+dynval1:                      # A dynamic family
+  variable: example           # A dynamic variable
+dynval2:                      # A dynamic family
+  variable: example           # A dynamic variable
+ +

Example with all variables modifiable

+ +
---
+var:                          # A suffix variable
+  - val1
+  - val2
+dynval1:                      # A dynamic family
+  variable: example           # A dynamic variable
+dynval2:                      # A dynamic family
+  variable: example           # A dynamic variable
\ No newline at end of file diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable.md b/tests/results/test_examples_comment/60_0family_dynamic_variable.md new file mode 100644 index 000000000..8758a1fdb --- /dev/null +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable.md @@ -0,0 +1,22 @@ +# Example with mandatory variables not filled in + +```yaml +--- +dynval1: # A dynamic family + variable: example # A dynamic variable +dynval2: # A dynamic family + variable: example # A dynamic variable +``` + +# Example with all variables modifiable + +```yaml +--- +var: # A suffix variable + - val1 + - val2 +dynval1: # A dynamic family + variable: example # A dynamic variable +dynval2: # A dynamic family + variable: example # A dynamic variable +``` \ No newline at end of file diff --git a/tests/results/test_examples_comment/60_0family_dynamic_variable.sh b/tests/results/test_examples_comment/60_0family_dynamic_variable.sh new file mode 100644 index 000000000..b78ee3ceb --- /dev/null +++ b/tests/results/test_examples_comment/60_0family_dynamic_variable.sh @@ -0,0 +1,19 @@ +Example with mandatory variables not filled in + +---  +dynval1: # A dynamic family  + variable: example # A dynamic variable  +dynval2: # A dynamic family  + variable: example # A dynamic variable  + +Example with all variables modifiable + +---  +var: # A suffix variable  + - val1  + - val2  +dynval1: # A dynamic family  + variable: example # A dynamic variable  +dynval2: # A dynamic family  + variable: example # A dynamic variable  + diff --git a/tests/results/test_examples_comment/warnings_60_0family_dynamic_variable b/tests/results/test_examples_comment/warnings_60_0family_dynamic_variable new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/results/test_examples_comment/warnings_60_0family_dynamic_variable @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/results/test_namespace/60_0family_dynamic_variable.adoc b/tests/results/test_namespace/60_0family_dynamic_variable.adoc new file mode 100644 index 000000000..44d88b617 --- /dev/null +++ b/tests/results/test_namespace/60_0family_dynamic_variable.adoc @@ -0,0 +1,44 @@ +== Rougail + +==== +**๐Ÿ›ˆ Informations** + +This family is a namespace. + +**Path**: rougail + +`basic` + +==== + +[cols="1a,1a"] +|==== +| Variable | Description +| **rougail.var** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `multiple` `standard` `mandatory` `unique` | A suffix variable. + +**Default**: + +* val1 +* val2 +|==== + +=== A dynamic family + +==== +**๐Ÿ›ˆ Informations** + +This family builds families dynamically. + +**Path**: + +* rougail.dyn__val1__ +* rougail.dyn__val2__ + +`basic` + +**Identifiers**: the value of the variable "A suffix variable" (rougail.var). + +==== + +[cols="1a,1a"] +|==== +| Variable | Description +| **rougail.dyn__val1__.variable** + +**rougail.dyn__val2__.variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | A dynamic variable. +|==== \ No newline at end of file diff --git a/tests/results/test_namespace/60_0family_dynamic_variable.gitlab.md b/tests/results/test_namespace/60_0family_dynamic_variable.gitlab.md new file mode 100644 index 000000000..1173f43ed --- /dev/null +++ b/tests/results/test_namespace/60_0family_dynamic_variable.gitlab.md @@ -0,0 +1,33 @@ +
Rougail + +> [!note] ๐Ÿ›ˆ Informations +> This family is a namespace. +> +> **Path**: rougail +> +> `basic` + +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **rougail.var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | + +
A dynamic family + +> [!note] ๐Ÿ›ˆ Informations +> This family builds families dynamically. +> +> **Path**: +> - rougail.dyn*val1* +> - rougail.dyn*val2* +> +> `basic` +> +> **Identifiers**: the value of the variable "[A suffix variable](#rougail.var)". + +| Variable | Description | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------| +| **rougail.dyn*val1*.variable**
**rougail.dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | + +
+ +
\ No newline at end of file diff --git a/tests/results/test_namespace/60_0family_dynamic_variable.html b/tests/results/test_namespace/60_0family_dynamic_variable.html new file mode 100644 index 000000000..75f983517 --- /dev/null +++ b/tests/results/test_namespace/60_0family_dynamic_variable.html @@ -0,0 +1,27 @@ +

Rougail

+ +This family is a namespace.
Path: rougail
basic + + + + + + + + +
Variable Description
rougail.var
string multiple standard mandatory unique
A suffix variable.
Default:
  • val1
  • +
  • val2
+ +

A dynamic family

+ +This family builds families dynamically.
Path:
basic
Identifiers: the value of the variable "A suffix variable" (rougail.var). + + + + + + + + +
Variable Description
rougail.dynval1.variable
rougail.dynval2.variable
string basic mandatory
A dynamic variable.
\ No newline at end of file diff --git a/tests/results/test_namespace/60_0family_dynamic_variable.json b/tests/results/test_namespace/60_0family_dynamic_variable.json new file mode 100644 index 000000000..3b4e2b3bd --- /dev/null +++ b/tests/results/test_namespace/60_0family_dynamic_variable.json @@ -0,0 +1,106 @@ +{ + "rougail": { + "type": "namespace", + "informations": { + "path": "rougail", + "name": "rougail", + "description": "Rougail", + "properties": [], + "mode": "basic", + "help": [ + "This family is a namespace" + ] + }, + "children": { + "var": { + "path": "rougail.var", + "name": "var", + "description": "A suffix variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, + "variable_type": "string", + "multiple": true + }, + "dyn{{ identifier }}": { + "type": "dynamic", + "informations": { + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "identifier_type": "many", + "help": [ + "This family builds families dynamically" + ], + "identifier": [ + { + "message": "the value of the variable {0}.", + "path": { + "path": "rougail.var", + "type": "variable" + }, + "description": "A suffix variable" + } + ] + }, + "children": { + "variable": { + "path": "rougail.dyn{{ identifier }}.variable", + "name": "variable", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "identifier_type": "many", + "type": "variable", + "variable_type": "string" + } + } + } + } + } +} \ No newline at end of file diff --git a/tests/results/test_namespace/60_0family_dynamic_variable.md b/tests/results/test_namespace/60_0family_dynamic_variable.md new file mode 100644 index 000000000..350290cda --- /dev/null +++ b/tests/results/test_namespace/60_0family_dynamic_variable.md @@ -0,0 +1,27 @@ +# Rougail + +> [!NOTE] +> +> This family is a namespace.\ +> **Path**: rougail\ +> `basic` + +| Variable | Description | +|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **rougail.var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | + +## A dynamic family + +> [!NOTE] +> +> This family builds families dynamically.\ +> **Path**: \ +> - rougail.dyn*val1*\ + +> - rougail.dyn*val2*\ +> `basic`\ +> **Identifiers**: the value of the variable "[A suffix variable](#rougail.var)". + +| Variable | Description | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------| +| **rougail.dyn*val1*.variable**
**rougail.dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | \ No newline at end of file diff --git a/tests/results/test_namespace/60_0family_dynamic_variable.sh b/tests/results/test_namespace/60_0family_dynamic_variable.sh new file mode 100644 index 000000000..12620db10 --- /dev/null +++ b/tests/results/test_namespace/60_0family_dynamic_variable.sh @@ -0,0 +1,36 @@ +Rougail + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family is a namespace. +โ–Œ Path: rougail +โ–Œ  basic  + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ rougail.var โ”‚ A suffix variable. โ”‚ +โ”‚  string   multiple   standard    โ”‚ Default: โ”‚ +โ”‚ mandatory   unique  โ”‚ โ€ข val1 โ”‚ +โ”‚ โ”‚ โ€ข val2 โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + + A dynamic family + +โ–Œ ๐Ÿ›ˆ Informations +โ–Œ  +โ–Œ This family builds families dynamically. +โ–Œ Path: +โ–Œ  โ€ข rougail.dynval1 +โ–Œ  โ€ข rougail.dynval2 +โ–Œ  basic  +โ–Œ Identifiers: the value of the variable "A suffix variable" (rougail.var). + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ rougail.dynval1.variable โ”‚ A dynamic variable. โ”‚ +โ”‚ rougail.dynval2.variable โ”‚ โ”‚ +โ”‚  string   basic   mandatory  โ”‚ โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/results/test_namespace/warnings_60_0family_dynamic_variable b/tests/results/test_namespace/warnings_60_0family_dynamic_variable new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/results/test_namespace/warnings_60_0family_dynamic_variable @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable.adoc b/tests/results/test_namespace_examples/60_0family_dynamic_variable.adoc new file mode 100644 index 000000000..80002de76 --- /dev/null +++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable.adoc @@ -0,0 +1,27 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +rougail: + dynval1: + variable: example + dynval2: + variable: example +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +rougail: + var: + - val1 + - val2 + dynval1: + variable: example + dynval2: + variable: example +---- diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable.gitlab.md b/tests/results/test_namespace_examples/60_0family_dynamic_variable.gitlab.md new file mode 100644 index 000000000..6b3c12084 --- /dev/null +++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable.gitlab.md @@ -0,0 +1,28 @@ +
Example with mandatory variables not filled in + +```yaml +--- +rougail: + dynval1: + variable: example + dynval2: + variable: example +``` + +
+ +
Example with all variables modifiable + +```yaml +--- +rougail: + var: + - val1 + - val2 + dynval1: + variable: example + dynval2: + variable: example +``` + +
\ No newline at end of file diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable.html b/tests/results/test_namespace_examples/60_0family_dynamic_variable.html new file mode 100644 index 000000000..d3c6a3924 --- /dev/null +++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable.html @@ -0,0 +1,20 @@ +

Example with mandatory variables not filled in

+ +
---
+rougail:
+  dynval1:
+    variable: example
+  dynval2:
+    variable: example
+ +

Example with all variables modifiable

+ +
---
+rougail:
+  var:
+    - val1
+    - val2
+  dynval1:
+    variable: example
+  dynval2:
+    variable: example
\ No newline at end of file diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable.md b/tests/results/test_namespace_examples/60_0family_dynamic_variable.md new file mode 100644 index 000000000..6c5eef72a --- /dev/null +++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable.md @@ -0,0 +1,24 @@ +# Example with mandatory variables not filled in + +```yaml +--- +rougail: + dynval1: + variable: example + dynval2: + variable: example +``` + +# Example with all variables modifiable + +```yaml +--- +rougail: + var: + - val1 + - val2 + dynval1: + variable: example + dynval2: + variable: example +``` \ No newline at end of file diff --git a/tests/results/test_namespace_examples/60_0family_dynamic_variable.sh b/tests/results/test_namespace_examples/60_0family_dynamic_variable.sh new file mode 100644 index 000000000..d0327b623 --- /dev/null +++ b/tests/results/test_namespace_examples/60_0family_dynamic_variable.sh @@ -0,0 +1,21 @@ +Example with mandatory variables not filled in + +---  +rougail:  + dynval1:  + variable: example  + dynval2:  + variable: example  + +Example with all variables modifiable + +---  +rougail:  + var:  + - val1  + - val2  + dynval1:  + variable: example  + dynval2:  + variable: example  + diff --git a/tests/results/test_namespace_examples/warnings_60_0family_dynamic_variable b/tests/results/test_namespace_examples/warnings_60_0family_dynamic_variable new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/results/test_namespace_examples/warnings_60_0family_dynamic_variable @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.adoc b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.adoc new file mode 100644 index 000000000..c6acb6565 --- /dev/null +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.adoc @@ -0,0 +1,27 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +rougail: # Rougail + dynval1: # A dynamic family + variable: example # A dynamic variable + dynval2: # A dynamic family + variable: example # A dynamic variable +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +rougail: # Rougail + var: # A suffix variable + - val1 + - val2 + dynval1: # A dynamic family + variable: example # A dynamic variable + dynval2: # A dynamic family + variable: example # A dynamic variable +---- diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.gitlab.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.gitlab.md new file mode 100644 index 000000000..c5a2e3c33 --- /dev/null +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.gitlab.md @@ -0,0 +1,28 @@ +
Example with mandatory variables not filled in + +```yaml +--- +rougail: # Rougail + dynval1: # A dynamic family + variable: example # A dynamic variable + dynval2: # A dynamic family + variable: example # A dynamic variable +``` + +
+ +
Example with all variables modifiable + +```yaml +--- +rougail: # Rougail + var: # A suffix variable + - val1 + - val2 + dynval1: # A dynamic family + variable: example # A dynamic variable + dynval2: # A dynamic family + variable: example # A dynamic variable +``` + +
\ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.html b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.html new file mode 100644 index 000000000..af4e64763 --- /dev/null +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.html @@ -0,0 +1,20 @@ +

Example with mandatory variables not filled in

+ +
---
+rougail:                      # Rougail
+  dynval1:                    # A dynamic family
+    variable: example         # A dynamic variable
+  dynval2:                    # A dynamic family
+    variable: example         # A dynamic variable
+ +

Example with all variables modifiable

+ +
---
+rougail:                      # Rougail
+  var:                        # A suffix variable
+    - val1
+    - val2
+  dynval1:                    # A dynamic family
+    variable: example         # A dynamic variable
+  dynval2:                    # A dynamic family
+    variable: example         # A dynamic variable
\ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.md b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.md new file mode 100644 index 000000000..ddfc9c0e1 --- /dev/null +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.md @@ -0,0 +1,24 @@ +# Example with mandatory variables not filled in + +```yaml +--- +rougail: # Rougail + dynval1: # A dynamic family + variable: example # A dynamic variable + dynval2: # A dynamic family + variable: example # A dynamic variable +``` + +# Example with all variables modifiable + +```yaml +--- +rougail: # Rougail + var: # A suffix variable + - val1 + - val2 + dynval1: # A dynamic family + variable: example # A dynamic variable + dynval2: # A dynamic family + variable: example # A dynamic variable +``` \ No newline at end of file diff --git a/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.sh b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.sh new file mode 100644 index 000000000..1fb7ed843 --- /dev/null +++ b/tests/results/test_namespace_examples_comment/60_0family_dynamic_variable.sh @@ -0,0 +1,21 @@ +Example with mandatory variables not filled in + +---  +rougail: # Rougail  + dynval1: # A dynamic family  + variable: example # A dynamic variable  + dynval2: # A dynamic family  + variable: example # A dynamic variable  + +Example with all variables modifiable + +---  +rougail: # Rougail  + var: # A suffix variable  + - val1  + - val2  + dynval1: # A dynamic family  + variable: example # A dynamic variable  + dynval2: # A dynamic family  + variable: example # A dynamic variable  + diff --git a/tests/results/test_namespace_examples_comment/warnings_60_0family_dynamic_variable b/tests/results/test_namespace_examples_comment/warnings_60_0family_dynamic_variable new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/results/test_namespace_examples_comment/warnings_60_0family_dynamic_variable @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.adoc b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.adoc new file mode 100644 index 000000000..8ccd54f70 --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.adoc @@ -0,0 +1,13 @@ +[cols="1a,1a"] +|==== +| Variable | Description +| **rougail.var** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `multiple` `standard` `mandatory` `unique` | A suffix variable. + +**Default**: + +* val1 +* val2 +| **rougail.dyn__val1__.variable** + +**rougail.dyn__val2__.variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | A dynamic variable. +|==== \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.adoc b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.adoc new file mode 100644 index 000000000..2d3b39457 --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.adoc @@ -0,0 +1,15 @@ +== New variables + +[cols="1a,1a"] +|==== +| Variable | Description +| **rougail.var** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `multiple` `standard` `mandatory` `unique` | A suffix variable. + +**Default**: + +* val1 +* val2 +| **rougail.dyn__val1__.variable** + +**rougail.dyn__val2__.variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | A dynamic variable. +|==== \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.gitlab.md b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.gitlab.md new file mode 100644 index 000000000..d7e4d3514 --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.gitlab.md @@ -0,0 +1,8 @@ +
New variables + +| Variable | Description | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **rougail.var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | +| **rougail.dyn*val1*.variable**
**rougail.dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | + +
\ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.html b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.html new file mode 100644 index 000000000..be373008d --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.html @@ -0,0 +1,12 @@ +

New variables

+ + + + + + + + + +
Variable Description
rougail.var
string multiple standard mandatory unique
A suffix variable.
Default:
  • val1
  • +
  • val2
rougail.dynval1.variable
rougail.dynval2.variable
string basic mandatory
A dynamic variable.
\ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.md b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.md new file mode 100644 index 000000000..3a1674383 --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.md @@ -0,0 +1,6 @@ +# New variables + +| Variable | Description | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **rougail.var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | +| **rougail.dyn*val1*.variable**
**rougail.dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.sh b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.sh new file mode 100644 index 000000000..34f03d974 --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.changelog.sh @@ -0,0 +1,15 @@ +New variables + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ rougail.var โ”‚ A suffix variable. โ”‚ +โ”‚  string   multiple   standard    โ”‚ Default: โ”‚ +โ”‚ mandatory   unique  โ”‚ โ€ข val1 โ”‚ +โ”‚ โ”‚ โ€ข val2 โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ rougail.dynval1.variable โ”‚ A dynamic variable. โ”‚ +โ”‚ rougail.dynval2.variable โ”‚ โ”‚ +โ”‚  string   basic   mandatory  โ”‚ โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.gitlab.md b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.gitlab.md new file mode 100644 index 000000000..9c5166b42 --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.gitlab.md @@ -0,0 +1,4 @@ +| Variable | Description | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **rougail.var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | +| **rougail.dyn*val1*.variable**
**rougail.dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.html b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.html new file mode 100644 index 000000000..7d263d755 --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.html @@ -0,0 +1,10 @@ + + + + + + + + +
Variable Description
rougail.var
string multiple standard mandatory unique
A suffix variable.
Default:
  • val1
  • +
  • val2
rougail.dynval1.variable
rougail.dynval2.variable
string basic mandatory
A dynamic variable.
\ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.json b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.json new file mode 100644 index 000000000..3b4e2b3bd --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.json @@ -0,0 +1,106 @@ +{ + "rougail": { + "type": "namespace", + "informations": { + "path": "rougail", + "name": "rougail", + "description": "Rougail", + "properties": [], + "mode": "basic", + "help": [ + "This family is a namespace" + ] + }, + "children": { + "var": { + "path": "rougail.var", + "name": "var", + "description": "A suffix variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, + "variable_type": "string", + "multiple": true + }, + "dyn{{ identifier }}": { + "type": "dynamic", + "informations": { + "path": "rougail.dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "identifier_type": "many", + "help": [ + "This family builds families dynamically" + ], + "identifier": [ + { + "message": "the value of the variable {0}.", + "path": { + "path": "rougail.var", + "type": "variable" + }, + "description": "A suffix variable" + } + ] + }, + "children": { + "variable": { + "path": "rougail.dyn{{ identifier }}.variable", + "name": "variable", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "identifier_type": "many", + "type": "variable", + "variable_type": "string" + } + } + } + } + } +} \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.md b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.md new file mode 100644 index 000000000..9c5166b42 --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.md @@ -0,0 +1,4 @@ +| Variable | Description | +|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **rougail.var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | +| **rougail.dyn*val1*.variable**
**rougail.dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | \ No newline at end of file diff --git a/tests/results/test_namespace_without_family/60_0family_dynamic_variable.sh b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.sh new file mode 100644 index 000000000..0ee8b068b --- /dev/null +++ b/tests/results/test_namespace_without_family/60_0family_dynamic_variable.sh @@ -0,0 +1,13 @@ +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ rougail.var โ”‚ A suffix variable. โ”‚ +โ”‚  string   multiple   standard    โ”‚ Default: โ”‚ +โ”‚ mandatory   unique  โ”‚ โ€ข val1 โ”‚ +โ”‚ โ”‚ โ€ข val2 โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ rougail.dynval1.variable โ”‚ A dynamic variable. โ”‚ +โ”‚ rougail.dynval2.variable โ”‚ โ”‚ +โ”‚  string   basic   mandatory  โ”‚ โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/results/test_namespace_without_family/warnings_60_0family_dynamic_variable b/tests/results/test_namespace_without_family/warnings_60_0family_dynamic_variable new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/results/test_namespace_without_family/warnings_60_0family_dynamic_variable @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.adoc b/tests/results/test_without_family/60_0family_dynamic_variable.adoc new file mode 100644 index 000000000..47aabbd06 --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.adoc @@ -0,0 +1,13 @@ +[cols="1a,1a"] +|==== +| Variable | Description +| **var** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `multiple` `standard` `mandatory` `unique` | A suffix variable. + +**Default**: + +* val1 +* val2 +| **dyn__val1__.variable** + +**dyn__val2__.variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | A dynamic variable. +|==== \ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.changelog.adoc b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.adoc new file mode 100644 index 000000000..e344e4012 --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.adoc @@ -0,0 +1,15 @@ +== New variables + +[cols="1a,1a"] +|==== +| Variable | Description +| **var** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `multiple` `standard` `mandatory` `unique` | A suffix variable. + +**Default**: + +* val1 +* val2 +| **dyn__val1__.variable** + +**dyn__val2__.variable** + +`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `basic` `mandatory` | A dynamic variable. +|==== \ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.changelog.gitlab.md b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.gitlab.md new file mode 100644 index 000000000..7694a6ae9 --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.gitlab.md @@ -0,0 +1,8 @@ +
New variables + +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | +| **dyn*val1*.variable**
**dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | + +
\ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.changelog.html b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.html new file mode 100644 index 000000000..3f6bb64bf --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.html @@ -0,0 +1,12 @@ +

New variables

+ + + + + + + + + +
Variable Description
var
string multiple standard mandatory unique
A suffix variable.
Default:
  • val1
  • +
  • val2
dynval1.variable
dynval2.variable
string basic mandatory
A dynamic variable.
\ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.changelog.md b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.md new file mode 100644 index 000000000..257e44c5a --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.md @@ -0,0 +1,6 @@ +# New variables + +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | +| **dyn*val1*.variable**
**dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | \ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.changelog.sh b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.sh new file mode 100644 index 000000000..24df8aa71 --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.changelog.sh @@ -0,0 +1,15 @@ +New variables + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ var โ”‚ A suffix variable. โ”‚ +โ”‚  string   multiple   standard    โ”‚ Default: โ”‚ +โ”‚ mandatory   unique  โ”‚ โ€ข val1 โ”‚ +โ”‚ โ”‚ โ€ข val2 โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ dynval1.variable โ”‚ A dynamic variable. โ”‚ +โ”‚ dynval2.variable โ”‚ โ”‚ +โ”‚  string   basic   mandatory  โ”‚ โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.gitlab.md b/tests/results/test_without_family/60_0family_dynamic_variable.gitlab.md new file mode 100644 index 000000000..95b41c365 --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.gitlab.md @@ -0,0 +1,4 @@ +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | +| **dyn*val1*.variable**
**dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | \ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.html b/tests/results/test_without_family/60_0family_dynamic_variable.html new file mode 100644 index 000000000..5f0d2c3ea --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.html @@ -0,0 +1,10 @@ + + + + + + + + +
Variable Description
var
string multiple standard mandatory unique
A suffix variable.
Default:
  • val1
  • +
  • val2
dynval1.variable
dynval2.variable
string basic mandatory
A dynamic variable.
\ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.json b/tests/results/test_without_family/60_0family_dynamic_variable.json new file mode 100644 index 000000000..3f94576cd --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.json @@ -0,0 +1,91 @@ +{ + "var": { + "path": "var", + "name": "var", + "description": "A suffix variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "unique", + "ori_name": "unique", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": [ + "val1", + "val2" + ] + }, + "variable_type": "string", + "multiple": true + }, + "dyn{{ identifier }}": { + "type": "dynamic", + "informations": { + "path": "dyn{{ identifier }}", + "name": "dyn{{ identifier }}", + "description": "A dynamic family", + "properties": [], + "mode": "basic", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "identifier_type": "many", + "help": [ + "This family builds families dynamically" + ], + "identifier": [ + { + "message": "the value of the variable {0}.", + "path": { + "path": "var", + "type": "variable" + }, + "description": "A suffix variable" + } + ] + }, + "children": { + "variable": { + "path": "dyn{{ identifier }}.variable", + "name": "variable", + "description": "A dynamic variable.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "basic", + "identifiers": [ + [ + "val1" + ], + [ + "val2" + ] + ], + "identifier_type": "many", + "type": "variable", + "variable_type": "string" + } + } + } +} \ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.md b/tests/results/test_without_family/60_0family_dynamic_variable.md new file mode 100644 index 000000000..95b41c365 --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.md @@ -0,0 +1,4 @@ +| Variable | Description | +|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------| +| **var**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `multiple` `standard` `mandatory` `unique` | A suffix variable.
**Default**:
โ€ข val1
โ€ข val2 | +| **dyn*val1*.variable**
**dyn*val2*.variable**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `basic` `mandatory` | A dynamic variable. | \ No newline at end of file diff --git a/tests/results/test_without_family/60_0family_dynamic_variable.sh b/tests/results/test_without_family/60_0family_dynamic_variable.sh new file mode 100644 index 000000000..2638a92ec --- /dev/null +++ b/tests/results/test_without_family/60_0family_dynamic_variable.sh @@ -0,0 +1,13 @@ +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ var โ”‚ A suffix variable. โ”‚ +โ”‚  string   multiple   standard    โ”‚ Default: โ”‚ +โ”‚ mandatory   unique  โ”‚ โ€ข val1 โ”‚ +โ”‚ โ”‚ โ€ข val2 โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ dynval1.variable โ”‚ A dynamic variable. โ”‚ +โ”‚ dynval2.variable โ”‚ โ”‚ +โ”‚  string   basic   mandatory  โ”‚ โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/results/test_without_family/warnings_60_0family_dynamic_variable b/tests/results/test_without_family/warnings_60_0family_dynamic_variable new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/tests/results/test_without_family/warnings_60_0family_dynamic_variable @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/tests/results_tutorial/140/doc.json b/tests/results_tutorial/140/doc.json index 63028886a..ca70cc943 100644 --- a/tests/results_tutorial/140/doc.json +++ b/tests/results_tutorial/140/doc.json @@ -481,12 +481,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/140/doc.sh b/tests/results_tutorial/140/doc.sh index 638a872a2..b1d584729 100644 --- a/tests/results_tutorial/140/doc.sh +++ b/tests/results_tutorial/140/doc.sh @@ -175,11 +175,9 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   standard   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: 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". โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.version) is โ”‚ +โ”‚ โ”‚ accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/results_tutorial/140/doc_changelog.sh b/tests/results_tutorial/140/doc_changelog.sh index e69de29bb..f1ebdfeff 100644 --- a/tests/results_tutorial/140/doc_changelog.sh +++ b/tests/results_tutorial/140/doc_changelog.sh @@ -0,0 +1,18 @@ +Modified variable + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ +โ”‚  boolean   standard   mandatory    โ”‚ Default: false โ”‚ +โ”‚ disabled  โ”‚ Disabled: 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". โ”‚ +โ”‚ โ”‚ if "SOCKS host version used by  โ”‚ +โ”‚ โ”‚ proxy" (manual.socks_proxy.version)  โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/results_tutorial/150/doc.json b/tests/results_tutorial/150/doc.json index 90d123139..10dca0a01 100644 --- a/tests/results_tutorial/150/doc.json +++ b/tests/results_tutorial/150/doc.json @@ -481,12 +481,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/150/doc.sh b/tests/results_tutorial/150/doc.sh index 5958a0f4d..0265008db 100644 --- a/tests/results_tutorial/150/doc.sh +++ b/tests/results_tutorial/150/doc.sh @@ -175,11 +175,9 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: 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". โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.version) is โ”‚ +โ”‚ โ”‚ accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/results_tutorial/150/doc_changelog.sh b/tests/results_tutorial/150/doc_changelog.sh index ce67879f3..671eab182 100644 --- a/tests/results_tutorial/150/doc_changelog.sh +++ b/tests/results_tutorial/150/doc_changelog.sh @@ -5,11 +5,9 @@ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  standard   advanced   boolean    โ”‚ Default: false โ”‚ -โ”‚ advanced   mandatory   disabled  โ”‚ Disabled: 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". โ”‚ +โ”‚ advanced   mandatory   disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.version) is โ”‚ +โ”‚ โ”‚ accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/results_tutorial/160/doc.json b/tests/results_tutorial/160/doc.json index 9ddc5bb61..d80e7ff6f 100644 --- a/tests/results_tutorial/160/doc.json +++ b/tests/results_tutorial/160/doc.json @@ -481,12 +481,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/160/doc.sh b/tests/results_tutorial/160/doc.sh index bb09da909..e62681e7f 100644 --- a/tests/results_tutorial/160/doc.sh +++ b/tests/results_tutorial/160/doc.sh @@ -175,12 +175,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: 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". โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.version) is โ”‚ +โ”‚ โ”‚ accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/161/doc.json b/tests/results_tutorial/161/doc.json index 2ac054b28..c2f83e26b 100644 --- a/tests/results_tutorial/161/doc.json +++ b/tests/results_tutorial/161/doc.json @@ -481,12 +481,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/161/doc.sh b/tests/results_tutorial/161/doc.sh index 5723060cc..c2ef21e19 100644 --- a/tests/results_tutorial/161/doc.sh +++ b/tests/results_tutorial/161/doc.sh @@ -175,12 +175,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: 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". โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.version) is โ”‚ +โ”‚ โ”‚ accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/162/doc.json b/tests/results_tutorial/162/doc.json index 47a13b5fb..d2a22c652 100644 --- a/tests/results_tutorial/162/doc.json +++ b/tests/results_tutorial/162/doc.json @@ -481,12 +481,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/162/doc.sh b/tests/results_tutorial/162/doc.sh index 74898ce75..7b54feac9 100644 --- a/tests/results_tutorial/162/doc.sh +++ b/tests/results_tutorial/162/doc.sh @@ -175,12 +175,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: 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". โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.version) is โ”‚ +โ”‚ โ”‚ accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/170/doc.json b/tests/results_tutorial/170/doc.json index f407ce84f..e616ea953 100644 --- a/tests/results_tutorial/170/doc.json +++ b/tests/results_tutorial/170/doc.json @@ -481,12 +481,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/170/doc.sh b/tests/results_tutorial/170/doc.sh index 534d54bf1..aa7f5c33f 100644 --- a/tests/results_tutorial/170/doc.sh +++ b/tests/results_tutorial/170/doc.sh @@ -175,12 +175,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: 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". โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ +โ”‚ โ”‚ (manual.socks_proxy.version) is โ”‚ +โ”‚ โ”‚ accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/180/doc.json b/tests/results_tutorial/180/doc.json index e582fc495..358ee6156 100644 --- a/tests/results_tutorial/180/doc.json +++ b/tests/results_tutorial/180/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/180/doc.sh b/tests/results_tutorial/180/doc.sh index fd5b99863..2315f6324 100644 --- a/tests/results_tutorial/180/doc.sh +++ b/tests/results_tutorial/180/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/180/doc_changelog.sh b/tests/results_tutorial/180/doc_changelog.sh index f6dadab88..0fa2febee 100644 --- a/tests/results_tutorial/180/doc_changelog.sh +++ b/tests/results_tutorial/180/doc_changelog.sh @@ -125,14 +125,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.dns_over_https.enable_dns_ovโ€ฆ โ”‚ Enable DNS over HTTPS. โ”‚ โ”‚  boolean   standard   mandatory  โ”‚ Default: false โ”‚ diff --git a/tests/results_tutorial/181/doc.json b/tests/results_tutorial/181/doc.json index e582fc495..358ee6156 100644 --- a/tests/results_tutorial/181/doc.json +++ b/tests/results_tutorial/181/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/181/doc.sh b/tests/results_tutorial/181/doc.sh index fd5b99863..2315f6324 100644 --- a/tests/results_tutorial/181/doc.sh +++ b/tests/results_tutorial/181/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/190/doc.json b/tests/results_tutorial/190/doc.json index 0b0279d50..f4b43cbb5 100644 --- a/tests/results_tutorial/190/doc.json +++ b/tests/results_tutorial/190/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/190/doc.sh b/tests/results_tutorial/190/doc.sh index 0ebf23d1e..fd8b052e4 100644 --- a/tests/results_tutorial/190/doc.sh +++ b/tests/results_tutorial/190/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/200/doc.json b/tests/results_tutorial/200/doc.json index 0d1bde103..3e2dca810 100644 --- a/tests/results_tutorial/200/doc.json +++ b/tests/results_tutorial/200/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/200/doc.sh b/tests/results_tutorial/200/doc.sh index fb59fdd66..f8a81ab0e 100644 --- a/tests/results_tutorial/200/doc.sh +++ b/tests/results_tutorial/200/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/201/doc.json b/tests/results_tutorial/201/doc.json index 713102c4d..bcd5ad7d9 100644 --- a/tests/results_tutorial/201/doc.json +++ b/tests/results_tutorial/201/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" diff --git a/tests/results_tutorial/201/doc.sh b/tests/results_tutorial/201/doc.sh index 5c9c3fb42..d17cec09a 100644 --- a/tests/results_tutorial/201/doc.sh +++ b/tests/results_tutorial/201/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/202/doc_changelog.sh b/tests/results_tutorial/202/doc_changelog.sh deleted file mode 100644 index 6ca22210d..000000000 --- a/tests/results_tutorial/202/doc_changelog.sh +++ /dev/null @@ -1,12 +0,0 @@ -Modified variable - -โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ -โ”ƒ Variable  โ”ƒ Description  โ”ƒ -โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ -โ”‚  standard   basic   regexp   basic    โ”‚ Validator: text based with regular โ”‚ -โ”‚ mandatory   auto modified  โ”‚ expressions โ”‚ -โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ -โ”‚ โ”‚ Default: random color value. โ”‚ -โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ - diff --git a/tests/results_tutorial/210/doc.json b/tests/results_tutorial/210/doc.json index 42222e6c8..1d47994f2 100644 --- a/tests/results_tutorial/210/doc.json +++ b/tests/results_tutorial/210/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" @@ -680,39 +676,6 @@ "variable_type": "string", "multiple": true }, - "type": { - "path": "foxyproxy.proxies.type", - "name": "type", - "description": "Proxy Type.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": "Direct (no proxy)" - }, - "variable_type": "choice", - "choices": { - "name": "Choices", - "values": [ - "HTTP", - "HTTPS/SSL", - "SOCKS4", - "SOCKS5", - "PAC URL", - "WPAD", - "System (use system settings)", - "Direct (no proxy)" - ] - } - }, "color": { "path": "foxyproxy.proxies.color", "name": "color", diff --git a/tests/results_tutorial/210/doc.sh b/tests/results_tutorial/210/doc.sh index 87f73bcdb..d765a6a23 100644 --- a/tests/results_tutorial/210/doc.sh +++ b/tests/results_tutorial/210/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS @@ -253,17 +249,6 @@ โ”‚  string   multiple   standard    โ”‚ โ”‚ โ”‚ unique  โ”‚ โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข HTTP โ”‚ -โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ -โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ -โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ -โ”‚ โ”‚ โ€ข PAC URL โ”‚ -โ”‚ โ”‚ โ€ข WPAD โ”‚ -โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ -โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ โ”‚  regexp   basic   mandatory   auto  โ”‚ Validator: text based with regular โ”‚ โ”‚ modified  โ”‚ expressions โ”‚ diff --git a/tests/results_tutorial/210/doc_changelog.sh b/tests/results_tutorial/210/doc_changelog.sh index 7662b21fa..6ca22210d 100644 --- a/tests/results_tutorial/210/doc_changelog.sh +++ b/tests/results_tutorial/210/doc_changelog.sh @@ -1,17 +1,12 @@ -New variable +Modified variable โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ -โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ -โ”‚ โ”‚ โ€ข HTTP โ”‚ -โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ -โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ -โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ -โ”‚ โ”‚ โ€ข PAC URL โ”‚ -โ”‚ โ”‚ โ€ข WPAD โ”‚ -โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ -โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ +โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ +โ”‚  standard   basic   regexp   basic    โ”‚ Validator: text based with regular โ”‚ +โ”‚ mandatory   auto modified  โ”‚ expressions โ”‚ +โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ +โ”‚ โ”‚ Default: random color value. โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/results_tutorial/220/doc.json b/tests/results_tutorial/220/doc.json index 951aae8f2..7af429484 100644 --- a/tests/results_tutorial/220/doc.json +++ b/tests/results_tutorial/220/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" @@ -745,139 +741,6 @@ "name": "Validator", "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" } - }, - "address": { - "path": "foxyproxy.proxies.address", - "name": "address", - "description": "IP address, DNS name, server name.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP address if proxy is not \"Manual\".", - "type": "variable", - "ori_path": "firefox.manual.http_proxy.address", - "optional": false, - "propertyerror": false - } - }, - "variable_type": "domainname", - "validators": { - "name": "Validators", - "values": [ - "type domainname", - "the domain name can be a hostname", - "the domain name can be an IP" - ] - } - }, - "port": { - "path": "foxyproxy.proxies.port", - "name": "port", - "description": "Port.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP port if proxy is not \"Manual\".", - "type": "variable", - "ori_path": "firefox.manual.http_proxy.port", - "optional": false, - "propertyerror": false - } - }, - "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" - ] - } - }, - "url": { - "path": "foxyproxy.proxies.url", - "name": "url", - "description": "URL.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type is not in:\n- PAC URL\n- WPAD.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "default": { - "name": "Default", - "values": { - "description": "copy HTTP address if proxy is \"Auto\".", - "type": "variable", - "ori_path": "firefox.auto", - "optional": false, - "propertyerror": false - } - }, - "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" - ] - } } } } diff --git a/tests/results_tutorial/220/doc.sh b/tests/results_tutorial/220/doc.sh index ab17ac83a..c10c658a4 100644 --- a/tests/results_tutorial/220/doc.sh +++ b/tests/results_tutorial/220/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS @@ -269,48 +265,5 @@ โ”‚ modified  โ”‚ expressions โ”‚ โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ โ”‚ โ”‚ Default: random color value. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ -โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ -โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ -โ”‚ โ”‚ not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ -โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is "Auto". โ”‚ -โ”‚ โ”‚ Disabled: if type is not in: โ”‚ -โ”‚ โ”‚ - PAC URL โ”‚ -โ”‚ โ”‚ - WPAD. โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/results_tutorial/220/doc_changelog.sh b/tests/results_tutorial/220/doc_changelog.sh index 12191d472..7662b21fa 100644 --- a/tests/results_tutorial/220/doc_changelog.sh +++ b/tests/results_tutorial/220/doc_changelog.sh @@ -1,49 +1,17 @@ -New variables +New variable โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ -โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ -โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ -โ”‚ โ”‚ not "Manual". โ”‚ -โ”‚ โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ -โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ -โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ -โ”‚ โ”‚ allowed โ”‚ -โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ -โ”‚ โ”‚ are allowed โ”‚ -โ”‚ โ”‚ โ€ข type domainname โ”‚ -โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ -โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ -โ”‚ โ”‚ is "Auto". โ”‚ -โ”‚ โ”‚ Disabled: if type is not in: โ”‚ -โ”‚ โ”‚ - PAC URL โ”‚ -โ”‚ โ”‚ - WPAD. โ”‚ +โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ +โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ +โ”‚ โ”‚ โ€ข HTTP โ”‚ +โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ +โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ +โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ +โ”‚ โ”‚ โ€ข PAC URL โ”‚ +โ”‚ โ”‚ โ€ข WPAD โ”‚ +โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ +โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/results_tutorial/230/doc.json b/tests/results_tutorial/230/doc.json index b39ccf21a..14f623d4a 100644 --- a/tests/results_tutorial/230/doc.json +++ b/tests/results_tutorial/230/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" @@ -834,56 +830,6 @@ ] } }, - "username": { - "path": "foxyproxy.proxies.username", - "name": "username", - "description": "Username.", - "properties": [ - { - "type": "property", - "name": "mandatory", - "ori_name": "mandatory", - "access_control": false, - "annotation": { - "description": "if a password is set.", - "type": "jinja" - } - }, - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "UNIX user" - }, - "password": { - "path": "foxyproxy.proxies.password", - "name": "password", - "description": "Password.", - "properties": [ - { - "type": "property", - "name": "disabled", - "ori_name": "disabled", - "access_control": true, - "annotation": { - "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", - "type": "jinja" - } - } - ], - "mode": "standard", - "type": "variable", - "variable_type": "secret" - }, "url": { "path": "foxyproxy.proxies.url", "name": "url", diff --git a/tests/results_tutorial/230/doc.sh b/tests/results_tutorial/230/doc.sh index 1462f00b4..683f7dfb1 100644 --- a/tests/results_tutorial/230/doc.sh +++ b/tests/results_tutorial/230/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS @@ -299,21 +295,6 @@ โ”‚ โ”‚ - SOCKS4 โ”‚ โ”‚ โ”‚ - SOCKS5. โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ -โ”‚  UNIX user   standard   mandatory    โ”‚ Mandatory: if a password is set. โ”‚ -โ”‚ disabled  โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.password โ”‚ Password. โ”‚ -โ”‚  secret   standard   disabled  โ”‚ Disabled: if type not in: โ”‚ -โ”‚ โ”‚ - HTTP โ”‚ -โ”‚ โ”‚ - HTTPS/SSL โ”‚ -โ”‚ โ”‚ - SOCKS4 โ”‚ -โ”‚ โ”‚ - SOCKS5. โ”‚ -โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ diff --git a/tests/results_tutorial/230/doc_changelog.sh b/tests/results_tutorial/230/doc_changelog.sh index 84bac03f6..12191d472 100644 --- a/tests/results_tutorial/230/doc_changelog.sh +++ b/tests/results_tutorial/230/doc_changelog.sh @@ -3,19 +3,47 @@ โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ -โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ -โ”‚  UNIX user   standard   mandatory    โ”‚ Mandatory: if a password is set. โ”‚ -โ”‚ disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ +โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ โ”‚ โ”‚ - HTTP โ”‚ โ”‚ โ”‚ - HTTPS/SSL โ”‚ โ”‚ โ”‚ - SOCKS4 โ”‚ โ”‚ โ”‚ - SOCKS5. โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค -โ”‚ foxyproxy.proxies.password โ”‚ Password. โ”‚ -โ”‚  secret   standard   disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ +โ”‚ โ”‚ not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ โ”‚ โ”‚ - HTTP โ”‚ โ”‚ โ”‚ - HTTPS/SSL โ”‚ โ”‚ โ”‚ - SOCKS4 โ”‚ โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ +โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is "Auto". โ”‚ +โ”‚ โ”‚ Disabled: if type is not in: โ”‚ +โ”‚ โ”‚ - PAC URL โ”‚ +โ”‚ โ”‚ - WPAD. โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/results_tutorial/202/doc.json b/tests/results_tutorial/240/doc.json similarity index 75% rename from tests/results_tutorial/202/doc.json rename to tests/results_tutorial/240/doc.json index d4c5d84d8..9c0304c98 100644 --- a/tests/results_tutorial/202/doc.json +++ b/tests/results_tutorial/240/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" @@ -680,6 +676,39 @@ "variable_type": "string", "multiple": true }, + "type": { + "path": "foxyproxy.proxies.type", + "name": "type", + "description": "Proxy Type.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": "Direct (no proxy)" + }, + "variable_type": "choice", + "choices": { + "name": "Choices", + "values": [ + "HTTP", + "HTTPS/SSL", + "SOCKS4", + "SOCKS5", + "PAC URL", + "WPAD", + "System (use system settings)", + "Direct (no proxy)" + ] + } + }, "color": { "path": "foxyproxy.proxies.color", "name": "color", @@ -712,6 +741,192 @@ "name": "Validator", "values": "text based with regular expressions \"^#(?:[0-9a-f]{3}){1,2}$\"" } + }, + "address": { + "path": "foxyproxy.proxies.address", + "name": "address", + "description": "IP address, DNS name, server name.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is not \"Manual\".", + "type": "variable", + "ori_path": "firefox.manual.http_proxy.address", + "optional": false, + "propertyerror": false + } + }, + "variable_type": "domainname", + "validators": { + "name": "Validators", + "values": [ + "type domainname", + "the domain name can be a hostname", + "the domain name can be an IP" + ] + } + }, + "port": { + "path": "foxyproxy.proxies.port", + "name": "port", + "description": "Port.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP port if proxy is not \"Manual\".", + "type": "variable", + "ori_path": "firefox.manual.http_proxy.port", + "optional": false, + "propertyerror": false + } + }, + "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" + ] + } + }, + "username": { + "path": "foxyproxy.proxies.username", + "name": "username", + "description": "Username.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false, + "annotation": { + "message": "when the variable {0} hasn't the value \"null\".", + "path": { + "path": "foxyproxy.proxies.password" + }, + "description": "Password" + } + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "UNIX user" + }, + "password": { + "path": "foxyproxy.proxies.password", + "name": "password", + "description": "Password.", + "properties": [ + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type not in:\n- HTTP\n- HTTPS/SSL\n- SOCKS4\n- SOCKS5.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "variable_type": "secret" + }, + "url": { + "path": "foxyproxy.proxies.url", + "name": "url", + "description": "URL.", + "properties": [ + { + "type": "property", + "name": "mandatory", + "ori_name": "mandatory", + "access_control": false + }, + { + "type": "property", + "name": "disabled", + "ori_name": "disabled", + "access_control": true, + "annotation": { + "description": "if type is not in:\n- PAC URL\n- WPAD.", + "type": "jinja" + } + } + ], + "mode": "standard", + "type": "variable", + "default": { + "name": "Default", + "values": { + "description": "copy HTTP address if proxy is \"Auto\".", + "type": "variable", + "ori_path": "firefox.auto", + "optional": false, + "propertyerror": false + } + }, + "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" + ] + } } } } diff --git a/tests/results_tutorial/202/doc.sh b/tests/results_tutorial/240/doc.sh similarity index 77% rename from tests/results_tutorial/202/doc.sh rename to tests/results_tutorial/240/doc.sh index e468adc1f..cad9b9b69 100644 --- a/tests/results_tutorial/202/doc.sh +++ b/tests/results_tutorial/240/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS @@ -253,10 +249,82 @@ โ”‚  string   multiple   standard    โ”‚ โ”‚ โ”‚ unique  โ”‚ โ”‚ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.type โ”‚ Proxy Type. โ”‚ +โ”‚  choice   standard   mandatory  โ”‚ Choices: โ”‚ +โ”‚ โ”‚ โ€ข HTTP โ”‚ +โ”‚ โ”‚ โ€ข HTTPS/SSL โ”‚ +โ”‚ โ”‚ โ€ข SOCKS4 โ”‚ +โ”‚ โ”‚ โ€ข SOCKS5 โ”‚ +โ”‚ โ”‚ โ€ข PAC URL โ”‚ +โ”‚ โ”‚ โ€ข WPAD โ”‚ +โ”‚ โ”‚ โ€ข System (use system settings) โ”‚ +โ”‚ โ”‚ โ€ข Direct (no proxy) โ† (default) โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ foxyproxy.proxies.color โ”‚ Color. โ”‚ โ”‚  regexp   basic   mandatory   auto  โ”‚ Validator: text based with regular โ”‚ โ”‚ modified  โ”‚ expressions โ”‚ โ”‚ โ”‚ "^#(?:[0-9a-f]{3}){1,2}$" โ”‚ โ”‚ โ”‚ Default: random color value. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.address โ”‚ IP address, DNS name, server name. โ”‚ +โ”‚  domainname   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be an IP โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.port โ”‚ Port. โ”‚ +โ”‚  port   standard   mandatory    โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข private ports (greater than 49152) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ Default: copy HTTP port if proxy is โ”‚ +โ”‚ โ”‚ not "Manual". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ +โ”‚  UNIX user   standard   mandatory    โ”‚ Mandatory: when the variable โ”‚ +โ”‚ disabled  โ”‚ "Password" โ”‚ +โ”‚ โ”‚ (foxyproxy.proxies.password) hasn't โ”‚ +โ”‚ โ”‚ the value "null". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.password โ”‚ Password. โ”‚ +โ”‚  secret   standard   disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.url โ”‚ URL. โ”‚ +โ”‚  web address   standard   mandatory  โ”‚ Validators: โ”‚ +โ”‚ disabled  โ”‚ โ€ข well-known ports (1 to 1023) are โ”‚ +โ”‚ โ”‚ allowed โ”‚ +โ”‚ โ”‚ โ€ข registred ports (1024 to 49151) โ”‚ +โ”‚ โ”‚ are allowed โ”‚ +โ”‚ โ”‚ โ€ข type domainname โ”‚ +โ”‚ โ”‚ โ€ข the domain name can be a hostname โ”‚ +โ”‚ โ”‚ Default: copy HTTP address if proxy โ”‚ +โ”‚ โ”‚ is "Auto". โ”‚ +โ”‚ โ”‚ Disabled: if type is not in: โ”‚ +โ”‚ โ”‚ - PAC URL โ”‚ +โ”‚ โ”‚ - WPAD. โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ diff --git a/tests/results_tutorial/240/doc_changelog.sh b/tests/results_tutorial/240/doc_changelog.sh new file mode 100644 index 000000000..94d839ac3 --- /dev/null +++ b/tests/results_tutorial/240/doc_changelog.sh @@ -0,0 +1,24 @@ +New variables + +โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ณโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”“ +โ”ƒ Variable  โ”ƒ Description  โ”ƒ +โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ +โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ +โ”‚  UNIX user   standard   mandatory    โ”‚ Mandatory: when the variable โ”‚ +โ”‚ disabled  โ”‚ "Password" โ”‚ +โ”‚ โ”‚ (foxyproxy.proxies.password) hasn't โ”‚ +โ”‚ โ”‚ the value "null". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค +โ”‚ foxyproxy.proxies.password โ”‚ Password. โ”‚ +โ”‚  secret   standard   disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚ โ”‚ - HTTP โ”‚ +โ”‚ โ”‚ - HTTPS/SSL โ”‚ +โ”‚ โ”‚ - SOCKS4 โ”‚ +โ”‚ โ”‚ - SOCKS5. โ”‚ +โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ + diff --git a/tests/results_tutorial/231/doc.json b/tests/results_tutorial/241/doc.json similarity index 99% rename from tests/results_tutorial/231/doc.json rename to tests/results_tutorial/241/doc.json index 0af36ce07..6435378fb 100644 --- a/tests/results_tutorial/231/doc.json +++ b/tests/results_tutorial/241/doc.json @@ -494,12 +494,8 @@ "ori_name": "disabled", "access_control": true, "annotation": { - "description": "if {0} is not \"Manual proxy configuration\"\nor {1} is \"v4\".", + "description": "if {0} is accessible and equals \"v4\".", "variables": [ - { - "path": "firefox.proxy_mode", - "description": "Configure Proxy Access to the Internet" - }, { "path": "firefox.manual.socks_proxy.version", "description": "SOCKS host version used by proxy" @@ -866,7 +862,10 @@ "access_control": true, "annotation": { "description": "if username is empty.", - "type": "jinja" + "type": "variable", + "ori_path": "foxyproxy.proxies.username", + "optional": false, + "propertyerror": true } }, { diff --git a/tests/results_tutorial/231/doc.sh b/tests/results_tutorial/241/doc.sh similarity index 98% rename from tests/results_tutorial/231/doc.sh rename to tests/results_tutorial/241/doc.sh index e5561ab65..6d1bfc468 100644 --- a/tests/results_tutorial/231/doc.sh +++ b/tests/results_tutorial/241/doc.sh @@ -183,14 +183,10 @@ โ”œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ผโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ค โ”‚ firefox.proxy_dns_socks5 โ”‚ Use proxy DNS when using SOCKS v5. โ”‚ โ”‚  boolean   advanced   mandatory    โ”‚ Default: false โ”‚ -โ”‚ disabled  โ”‚ Disabled: if "Configure Proxy Access โ”‚ -โ”‚ โ”‚ to the Internet" โ”‚ -โ”‚ โ”‚ (firefox.proxy_mode) is not "Manual โ”‚ -โ”‚ โ”‚ proxy configuration" โ”‚ -โ”‚ โ”‚ or "SOCKS host version used by โ”‚ -โ”‚ โ”‚ proxy" โ”‚ +โ”‚ disabled  โ”‚ Disabled: if "SOCKS host version โ”‚ +โ”‚ โ”‚ used by proxy" โ”‚ โ”‚ โ”‚ (firefox.manual.socks_proxy.version) โ”‚ -โ”‚ โ”‚ is "v4". โ”‚ +โ”‚ โ”‚ is accessible and equals "v4". โ”‚ โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”ดโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”˜ DNS over HTTPS diff --git a/tests/results_tutorial/231/doc_changelog.sh b/tests/results_tutorial/241/doc_changelog.sh similarity index 86% rename from tests/results_tutorial/231/doc_changelog.sh rename to tests/results_tutorial/241/doc_changelog.sh index 3d0b3d3ce..da8670792 100644 --- a/tests/results_tutorial/231/doc_changelog.sh +++ b/tests/results_tutorial/241/doc_changelog.sh @@ -4,8 +4,11 @@ โ”ƒ Variable  โ”ƒ Description  โ”ƒ โ”กโ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ•‡โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”ฉ โ”‚ foxyproxy.proxies.username โ”‚ Username. โ”‚ -โ”‚  mandatory   UNIX user   standard    โ”‚ Mandatory: if a password is set. โ”‚ -โ”‚ disabled  โ”‚ Disabled: if type not in: โ”‚ +โ”‚  mandatory   UNIX user   standard    โ”‚ Mandatory: when the variable  โ”‚ +โ”‚ disabled  โ”‚ "Password"  โ”‚ +โ”‚ โ”‚ (foxyproxy.proxies.password) hasn't  โ”‚ +โ”‚ โ”‚ the value "null". โ”‚ +โ”‚ โ”‚ Disabled: if type not in: โ”‚ โ”‚ โ”‚ - HTTP โ”‚ โ”‚ โ”‚ - HTTPS/SSL โ”‚ โ”‚ โ”‚ - SOCKS4 โ”‚