diff --git a/src/rougail/user_data_yaml/__init__.py b/src/rougail/user_data_yaml/__init__.py index 648c1b5..a623f01 100644 --- a/src/rougail/user_data_yaml/__init__.py +++ b/src/rougail/user_data_yaml/__init__.py @@ -130,7 +130,7 @@ class RougailUserDataYaml: if isinstance(value, dict): self.parse(values, path + ".", value, filename) elif isinstance(value, list) and value and isinstance(value[0], dict): - # it's a leadership + # it's a sequence keys = [] for val in value: if not isinstance(val, dict): diff --git a/src/rougail/user_data_yaml/config.py b/src/rougail/user_data_yaml/config.py index cd09f62..fbfd274 100644 --- a/src/rougail/user_data_yaml/config.py +++ b/src/rougail/user_data_yaml/config.py @@ -27,7 +27,8 @@ def get_rougail_config( ) -> dict: options = f""" yaml: - description: {_("Charge user data from YAML file")} + description: {_("Load user data from YAML file")} + help: {_("Variable values can be defined in a list of YAML files.")} disabled: jinja: >- {{{{ step.user_data is propertyerror or 'yaml' not in step.user_data }}}} diff --git a/tests/result_tutorial/090/01_ro.json b/tests/result_tutorial/090/01_ro.json index 5bb5e67..8528f7c 100644 --- a/tests/result_tutorial/090/01_ro.json +++ b/tests/result_tutorial/090/01_ro.json @@ -1,3 +1,11 @@ { - "proxy_mode": "No proxy" + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.https_proxy.address": "http.proxy.net", + "manual.https_proxy.port": "8080", + "manual.socks_proxy.address": null, + "manual.socks_proxy.port": "1080", + "manual.socks_proxy.version": "v5" } \ No newline at end of file diff --git a/tests/result_tutorial/090/01_rw.json b/tests/result_tutorial/090/01_rw.json index 5bb5e67..aff02dc 100644 --- a/tests/result_tutorial/090/01_rw.json +++ b/tests/result_tutorial/090/01_rw.json @@ -1,3 +1,9 @@ { - "proxy_mode": "No proxy" + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.socks_proxy.address": null, + "manual.socks_proxy.port": "1080", + "manual.socks_proxy.version": "v5" } \ No newline at end of file diff --git a/tests/result_tutorial/090/errors_01.json b/tests/result_tutorial/090/errors_01.json index 4675473..217db0a 100644 --- a/tests/result_tutorial/090/errors_01.json +++ b/tests/result_tutorial/090/errors_01.json @@ -1,12 +1,4 @@ { "errors": [], - "warnings": [ - [ - [ - "variable has property disabled, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/090/config/01/config.yml\"", - "auto", - null - ] - ] - ] + "warnings": [] } \ No newline at end of file diff --git a/tests/result_tutorial/091/01_ro.json b/tests/result_tutorial/091/01_ro.json new file mode 100644 index 0000000..d3947b5 --- /dev/null +++ b/tests/result_tutorial/091/01_ro.json @@ -0,0 +1,9 @@ +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.https_proxy.address": "http.proxy.net", + "manual.https_proxy.port": "8080", + "manual.socks_proxy.address": null +} \ No newline at end of file diff --git a/tests/result_tutorial/091/01_rw.json b/tests/result_tutorial/091/01_rw.json new file mode 100644 index 0000000..b345a70 --- /dev/null +++ b/tests/result_tutorial/091/01_rw.json @@ -0,0 +1,7 @@ +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.socks_proxy.address": null +} \ No newline at end of file diff --git a/tests/result_tutorial/091/02_ro.json b/tests/result_tutorial/091/02_ro.json new file mode 100644 index 0000000..d3947b5 --- /dev/null +++ b/tests/result_tutorial/091/02_ro.json @@ -0,0 +1,9 @@ +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.https_proxy.address": "http.proxy.net", + "manual.https_proxy.port": "8080", + "manual.socks_proxy.address": null +} \ No newline at end of file diff --git a/tests/result_tutorial/091/02_rw.json b/tests/result_tutorial/091/02_rw.json new file mode 100644 index 0000000..b345a70 --- /dev/null +++ b/tests/result_tutorial/091/02_rw.json @@ -0,0 +1,7 @@ +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.socks_proxy.address": null +} \ No newline at end of file diff --git a/tests/result_tutorial/182/errors_01.json b/tests/result_tutorial/091/errors_01.json similarity index 100% rename from tests/result_tutorial/182/errors_01.json rename to tests/result_tutorial/091/errors_01.json diff --git a/tests/result_tutorial/091/errors_02.json b/tests/result_tutorial/091/errors_02.json new file mode 100644 index 0000000..19f93e2 --- /dev/null +++ b/tests/result_tutorial/091/errors_02.json @@ -0,0 +1,12 @@ +{ + "errors": [], + "warnings": [ + [ + [ + "variable or family \"adress\" does not exist so cannot load \"manual.socks_proxy.adress\", it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/091/config/02/config.yml\"", + "manual.socks_proxy", + null + ] + ] + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/100/02_ro.json b/tests/result_tutorial/100/02_ro.json index 20a00e9..27e3c98 100644 --- a/tests/result_tutorial/100/02_ro.json +++ b/tests/result_tutorial/100/02_ro.json @@ -1,5 +1,9 @@ -{ - "proxy_mode": "Automatic proxy configuration URL", - "auto": "https://auto.proxy.net/wpad.dat", - "no_proxy": "192.168.1.0/24" -} \ No newline at end of file +[ + [ + [ + "mandatory variable but has no value", + "auto", + null + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/100/02_rw.json b/tests/result_tutorial/100/02_rw.json index 20a00e9..27e3c98 100644 --- a/tests/result_tutorial/100/02_rw.json +++ b/tests/result_tutorial/100/02_rw.json @@ -1,5 +1,9 @@ -{ - "proxy_mode": "Automatic proxy configuration URL", - "auto": "https://auto.proxy.net/wpad.dat", - "no_proxy": "192.168.1.0/24" -} \ No newline at end of file +[ + [ + [ + "mandatory variable but has no value", + "auto", + null + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/090/03_ro.json b/tests/result_tutorial/100/03_ro.json similarity index 100% rename from tests/result_tutorial/090/03_ro.json rename to tests/result_tutorial/100/03_ro.json diff --git a/tests/result_tutorial/090/03_rw.json b/tests/result_tutorial/100/03_rw.json similarity index 100% rename from tests/result_tutorial/090/03_rw.json rename to tests/result_tutorial/100/03_rw.json diff --git a/tests/result_tutorial/100/errors_01.json b/tests/result_tutorial/100/errors_01.json index 217db0a..6438b17 100644 --- a/tests/result_tutorial/100/errors_01.json +++ b/tests/result_tutorial/100/errors_01.json @@ -1,4 +1,12 @@ { "errors": [], - "warnings": [] + "warnings": [ + [ + [ + "variable has property disabled, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/100/config/01/config.yml\"", + "auto", + null + ] + ] + ] } \ No newline at end of file diff --git a/tests/result_tutorial/090/errors_03.json b/tests/result_tutorial/100/errors_03.json similarity index 100% rename from tests/result_tutorial/090/errors_03.json rename to tests/result_tutorial/100/errors_03.json diff --git a/tests/result_tutorial/110/02_ro.json b/tests/result_tutorial/110/02_ro.json index 2099483..20a00e9 100644 --- a/tests/result_tutorial/110/02_ro.json +++ b/tests/result_tutorial/110/02_ro.json @@ -1,13 +1,5 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.https_proxy.address": "http.proxy.net", - "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": "192.168.1.0/24" } \ No newline at end of file diff --git a/tests/result_tutorial/110/02_rw.json b/tests/result_tutorial/110/02_rw.json index d1b947d..20a00e9 100644 --- a/tests/result_tutorial/110/02_rw.json +++ b/tests/result_tutorial/110/02_rw.json @@ -1,11 +1,5 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": "192.168.1.0/24" } \ No newline at end of file diff --git a/tests/result_tutorial/111/01_ro.json b/tests/result_tutorial/111/01_ro.json index 90c1bc7..5bb5e67 100644 --- a/tests/result_tutorial/111/01_ro.json +++ b/tests/result_tutorial/111/01_ro.json @@ -1,4 +1,3 @@ { - "proxy_mode": "No proxy", - "proxy_dns_socks5": false + "proxy_mode": "No proxy" } \ No newline at end of file diff --git a/tests/result_tutorial/111/01_rw.json b/tests/result_tutorial/111/01_rw.json index 90c1bc7..5bb5e67 100644 --- a/tests/result_tutorial/111/01_rw.json +++ b/tests/result_tutorial/111/01_rw.json @@ -1,4 +1,3 @@ { - "proxy_mode": "No proxy", - "proxy_dns_socks5": false + "proxy_mode": "No proxy" } \ No newline at end of file diff --git a/tests/result_tutorial/111/02_ro.json b/tests/result_tutorial/111/02_ro.json index f7aa181..ebf11b6 100644 --- a/tests/result_tutorial/111/02_ro.json +++ b/tests/result_tutorial/111/02_ro.json @@ -1,14 +1,8 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.https_proxy.address": "http.proxy.net", - "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": false + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [ + "example.net", + "192.168.1.0/24" + ] } \ No newline at end of file diff --git a/tests/result_tutorial/111/02_rw.json b/tests/result_tutorial/111/02_rw.json index cbc5386..ebf11b6 100644 --- a/tests/result_tutorial/111/02_rw.json +++ b/tests/result_tutorial/111/02_rw.json @@ -1,12 +1,8 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": false + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [ + "example.net", + "192.168.1.0/24" + ] } \ No newline at end of file diff --git a/tests/result_tutorial/111/03_ro.json b/tests/result_tutorial/111/03_ro.json index b06d469..ff19f5f 100644 --- a/tests/result_tutorial/111/03_ro.json +++ b/tests/result_tutorial/111/03_ro.json @@ -1,14 +1,5 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.https_proxy.address": "http.proxy.net", - "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": true + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [] } \ No newline at end of file diff --git a/tests/result_tutorial/111/03_rw.json b/tests/result_tutorial/111/03_rw.json index dd9aa5c..ff19f5f 100644 --- a/tests/result_tutorial/111/03_rw.json +++ b/tests/result_tutorial/111/03_rw.json @@ -1,12 +1,5 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": true + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [] } \ No newline at end of file diff --git a/tests/result_tutorial/120/02_ro.json b/tests/result_tutorial/120/02_ro.json index f7aa181..ebf11b6 100644 --- a/tests/result_tutorial/120/02_ro.json +++ b/tests/result_tutorial/120/02_ro.json @@ -1,14 +1,8 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.https_proxy.address": "http.proxy.net", - "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": false + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [ + "example.net", + "192.168.1.0/24" + ] } \ No newline at end of file diff --git a/tests/result_tutorial/120/02_rw.json b/tests/result_tutorial/120/02_rw.json index cbc5386..ebf11b6 100644 --- a/tests/result_tutorial/120/02_rw.json +++ b/tests/result_tutorial/120/02_rw.json @@ -1,12 +1,8 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": false + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [ + "example.net", + "192.168.1.0/24" + ] } \ No newline at end of file diff --git a/tests/result_tutorial/120/03_ro.json b/tests/result_tutorial/120/03_ro.json index b06d469..ff19f5f 100644 --- a/tests/result_tutorial/120/03_ro.json +++ b/tests/result_tutorial/120/03_ro.json @@ -1,14 +1,5 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.https_proxy.address": "http.proxy.net", - "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": true + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [] } \ No newline at end of file diff --git a/tests/result_tutorial/120/03_rw.json b/tests/result_tutorial/120/03_rw.json index dd9aa5c..ff19f5f 100644 --- a/tests/result_tutorial/120/03_rw.json +++ b/tests/result_tutorial/120/03_rw.json @@ -1,12 +1,5 @@ { - "proxy_mode": "Manual proxy configuration", - "manual.http_proxy.address": "http.proxy.net", - "manual.http_proxy.port": "8080", - "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", - "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": true + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [] } \ No newline at end of file diff --git a/tests/result_tutorial/121/01_ro.json b/tests/result_tutorial/121/01_ro.json new file mode 100644 index 0000000..5bb5e67 --- /dev/null +++ b/tests/result_tutorial/121/01_ro.json @@ -0,0 +1,3 @@ +{ + "proxy_mode": "No proxy" +} \ No newline at end of file diff --git a/tests/result_tutorial/121/01_rw.json b/tests/result_tutorial/121/01_rw.json new file mode 100644 index 0000000..5bb5e67 --- /dev/null +++ b/tests/result_tutorial/121/01_rw.json @@ -0,0 +1,3 @@ +{ + "proxy_mode": "No proxy" +} \ No newline at end of file diff --git a/tests/result_tutorial/121/02_ro.json b/tests/result_tutorial/121/02_ro.json new file mode 100644 index 0000000..ff19f5f --- /dev/null +++ b/tests/result_tutorial/121/02_ro.json @@ -0,0 +1,5 @@ +{ + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/121/02_rw.json b/tests/result_tutorial/121/02_rw.json new file mode 100644 index 0000000..ff19f5f --- /dev/null +++ b/tests/result_tutorial/121/02_rw.json @@ -0,0 +1,5 @@ +{ + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/121/03_ro.json b/tests/result_tutorial/121/03_ro.json new file mode 100644 index 0000000..e7b47b3 --- /dev/null +++ b/tests/result_tutorial/121/03_ro.json @@ -0,0 +1,8 @@ +{ + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [ + ".example.net", + "192.168.1.0/24" + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/121/03_rw.json b/tests/result_tutorial/121/03_rw.json new file mode 100644 index 0000000..e7b47b3 --- /dev/null +++ b/tests/result_tutorial/121/03_rw.json @@ -0,0 +1,8 @@ +{ + "proxy_mode": "Automatic proxy configuration URL", + "auto": "https://auto.proxy.net/wpad.dat", + "no_proxy": [ + ".example.net", + "192.168.1.0/24" + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/211/errors_01.json b/tests/result_tutorial/121/errors_01.json similarity index 100% rename from tests/result_tutorial/211/errors_01.json rename to tests/result_tutorial/121/errors_01.json diff --git a/tests/result_tutorial/090/errors_02.json b/tests/result_tutorial/121/errors_02.json similarity index 100% rename from tests/result_tutorial/090/errors_02.json rename to tests/result_tutorial/121/errors_02.json diff --git a/tests/result_tutorial/181/errors_03.json b/tests/result_tutorial/121/errors_03.json similarity index 100% rename from tests/result_tutorial/181/errors_03.json rename to tests/result_tutorial/121/errors_03.json diff --git a/tests/result_tutorial/130/02_ro.json b/tests/result_tutorial/130/02_ro.json index f7aa181..cc3047c 100644 --- a/tests/result_tutorial/130/02_ro.json +++ b/tests/result_tutorial/130/02_ro.json @@ -5,10 +5,7 @@ "manual.use_for_https": true, "manual.https_proxy.address": "http.proxy.net", "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", + "manual.socks_proxy.address": null, "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": false + "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/130/02_rw.json b/tests/result_tutorial/130/02_rw.json index cbc5386..dca9f46 100644 --- a/tests/result_tutorial/130/02_rw.json +++ b/tests/result_tutorial/130/02_rw.json @@ -3,10 +3,7 @@ "manual.http_proxy.address": "http.proxy.net", "manual.http_proxy.port": "8080", "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", + "manual.socks_proxy.address": null, "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": false + "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/130/03_ro.json b/tests/result_tutorial/130/03_ro.json index b06d469..cc3047c 100644 --- a/tests/result_tutorial/130/03_ro.json +++ b/tests/result_tutorial/130/03_ro.json @@ -5,10 +5,7 @@ "manual.use_for_https": true, "manual.https_proxy.address": "http.proxy.net", "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", + "manual.socks_proxy.address": null, "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": true + "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/130/03_rw.json b/tests/result_tutorial/130/03_rw.json index dd9aa5c..dca9f46 100644 --- a/tests/result_tutorial/130/03_rw.json +++ b/tests/result_tutorial/130/03_rw.json @@ -3,10 +3,7 @@ "manual.http_proxy.address": "http.proxy.net", "manual.http_proxy.port": "8080", "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v5", + "manual.socks_proxy.address": null, "no_proxy": [], - "prompt_authentication": true, - "proxy_dns_socks5": true + "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/130/04_ro.json b/tests/result_tutorial/130/04_ro.json index bbf9a1d..cc3047c 100644 --- a/tests/result_tutorial/130/04_ro.json +++ b/tests/result_tutorial/130/04_ro.json @@ -5,9 +5,7 @@ "manual.use_for_https": true, "manual.https_proxy.address": "http.proxy.net", "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v4", + "manual.socks_proxy.address": null, "no_proxy": [], "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/130/04_rw.json b/tests/result_tutorial/130/04_rw.json index 59815c5..dca9f46 100644 --- a/tests/result_tutorial/130/04_rw.json +++ b/tests/result_tutorial/130/04_rw.json @@ -3,9 +3,7 @@ "manual.http_proxy.address": "http.proxy.net", "manual.http_proxy.port": "8080", "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v4", + "manual.socks_proxy.address": null, "no_proxy": [], "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/130/errors_04.json b/tests/result_tutorial/130/errors_04.json index 217db0a..a9594f2 100644 --- a/tests/result_tutorial/130/errors_04.json +++ b/tests/result_tutorial/130/errors_04.json @@ -1,4 +1,12 @@ { "errors": [], - "warnings": [] + "warnings": [ + [ + [ + "variable has property disabled, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/130/config/04/config.yml\"", + "manual.socks_proxy.version", + null + ] + ] + ] } \ No newline at end of file diff --git a/tests/result_tutorial/131/01_ro.json b/tests/result_tutorial/131/01_ro.json new file mode 100644 index 0000000..5bb5e67 --- /dev/null +++ b/tests/result_tutorial/131/01_ro.json @@ -0,0 +1,3 @@ +{ + "proxy_mode": "No proxy" +} \ No newline at end of file diff --git a/tests/result_tutorial/131/01_rw.json b/tests/result_tutorial/131/01_rw.json new file mode 100644 index 0000000..5bb5e67 --- /dev/null +++ b/tests/result_tutorial/131/01_rw.json @@ -0,0 +1,3 @@ +{ + "proxy_mode": "No proxy" +} \ No newline at end of file diff --git a/tests/result_tutorial/131/02_ro.json b/tests/result_tutorial/131/02_ro.json new file mode 100644 index 0000000..6c25259 --- /dev/null +++ b/tests/result_tutorial/131/02_ro.json @@ -0,0 +1,9 @@ +[ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "proxy_dns_socks5", + null + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/131/02_rw.json b/tests/result_tutorial/131/02_rw.json new file mode 100644 index 0000000..6c25259 --- /dev/null +++ b/tests/result_tutorial/131/02_rw.json @@ -0,0 +1,9 @@ +[ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "proxy_dns_socks5", + null + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/131/03_ro.json b/tests/result_tutorial/131/03_ro.json new file mode 100644 index 0000000..6c25259 --- /dev/null +++ b/tests/result_tutorial/131/03_ro.json @@ -0,0 +1,9 @@ +[ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "proxy_dns_socks5", + null + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/131/03_rw.json b/tests/result_tutorial/131/03_rw.json new file mode 100644 index 0000000..6c25259 --- /dev/null +++ b/tests/result_tutorial/131/03_rw.json @@ -0,0 +1,9 @@ +[ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "proxy_dns_socks5", + null + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/131/04_ro.json b/tests/result_tutorial/131/04_ro.json new file mode 100644 index 0000000..6c25259 --- /dev/null +++ b/tests/result_tutorial/131/04_ro.json @@ -0,0 +1,9 @@ +[ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "proxy_dns_socks5", + null + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/131/04_rw.json b/tests/result_tutorial/131/04_rw.json new file mode 100644 index 0000000..6c25259 --- /dev/null +++ b/tests/result_tutorial/131/04_rw.json @@ -0,0 +1,9 @@ +[ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\"", + "proxy_dns_socks5", + null + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/180/errors_02.json b/tests/result_tutorial/131/errors_01.json similarity index 100% rename from tests/result_tutorial/180/errors_02.json rename to tests/result_tutorial/131/errors_01.json diff --git a/tests/result_tutorial/131/errors_02.json b/tests/result_tutorial/131/errors_02.json new file mode 100644 index 0000000..73876f9 --- /dev/null +++ b/tests/result_tutorial/131/errors_02.json @@ -0,0 +1,12 @@ +{ + "errors": [], + "warnings": [ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "proxy_dns_socks5", + null + ] + ] + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/131/errors_03.json b/tests/result_tutorial/131/errors_03.json new file mode 100644 index 0000000..4a2bdce --- /dev/null +++ b/tests/result_tutorial/131/errors_03.json @@ -0,0 +1,26 @@ +{ + "errors": [], + "warnings": [ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "proxy_dns_socks5", + null + ] + ], + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "proxy_dns_socks5", + null + ] + ], + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/131/config/03/config.yml\"", + "proxy_dns_socks5", + null + ] + ] + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/131/errors_04.json b/tests/result_tutorial/131/errors_04.json new file mode 100644 index 0000000..bfe2ea1 --- /dev/null +++ b/tests/result_tutorial/131/errors_04.json @@ -0,0 +1,26 @@ +{ + "errors": [], + "warnings": [ + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "proxy_dns_socks5", + null + ] + ], + [ + [ + "unexpected error \"cannot access to option \"version\" (SOCKS host version used by proxy) because has property \"disabled\"\" in function \"jinja_to_property\" with arguments \"['disabled', 'if \"_.proxy_mode\" is not \"Manual proxy configuration\"\\nor \"_.manual.socks_proxy.version\" is \"v4\"']\" and \"{'__internal_jinja': 'disabled_proxy_dns_socks5', '__internal_type': 'boolean', '__internal_multi': False, '__internal_files': ['tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml'], '__internal_attribute': 'disabled', '__internal_variable': 'proxy_dns_socks5', 'when': True, 'inverse': False, '_.proxy_mode': 'Manual proxy configuration', '_.manual.socks_proxy.version': PropertiesOptionError(None)}\" for option \"proxy_dns_socks5\" (Use proxy DNS when using SOCKS v5) in \"tutorial_tmp/structural/firefox/55-proxy_dns_socks5.yml\", it will be ignored", + "proxy_dns_socks5", + null + ] + ], + [ + [ + "variable has property disabled, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/131/config/04/config.yml\"", + "manual.socks_proxy.version", + null + ] + ] + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/140/01_ro.json b/tests/result_tutorial/140/01_ro.json index 98f3d7c..5bb5e67 100644 --- a/tests/result_tutorial/140/01_ro.json +++ b/tests/result_tutorial/140/01_ro.json @@ -1,4 +1,3 @@ { - "proxy_mode": "No proxy", - "dns_over_https.enable_dns_over_https": false + "proxy_mode": "No proxy" } \ No newline at end of file diff --git a/tests/result_tutorial/140/01_rw.json b/tests/result_tutorial/140/01_rw.json index 98f3d7c..5bb5e67 100644 --- a/tests/result_tutorial/140/01_rw.json +++ b/tests/result_tutorial/140/01_rw.json @@ -1,4 +1,3 @@ { - "proxy_mode": "No proxy", - "dns_over_https.enable_dns_over_https": false + "proxy_mode": "No proxy" } \ No newline at end of file diff --git a/tests/result_tutorial/140/02_ro.json b/tests/result_tutorial/140/02_ro.json new file mode 100644 index 0000000..cc3047c --- /dev/null +++ b/tests/result_tutorial/140/02_ro.json @@ -0,0 +1,11 @@ +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.https_proxy.address": "http.proxy.net", + "manual.https_proxy.port": "8080", + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true +} \ No newline at end of file diff --git a/tests/result_tutorial/140/02_rw.json b/tests/result_tutorial/140/02_rw.json new file mode 100644 index 0000000..dca9f46 --- /dev/null +++ b/tests/result_tutorial/140/02_rw.json @@ -0,0 +1,9 @@ +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true +} \ No newline at end of file diff --git a/tests/result_tutorial/140/03_ro.json b/tests/result_tutorial/140/03_ro.json new file mode 100644 index 0000000..cc3047c --- /dev/null +++ b/tests/result_tutorial/140/03_ro.json @@ -0,0 +1,11 @@ +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.https_proxy.address": "http.proxy.net", + "manual.https_proxy.port": "8080", + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true +} \ No newline at end of file diff --git a/tests/result_tutorial/140/03_rw.json b/tests/result_tutorial/140/03_rw.json new file mode 100644 index 0000000..dca9f46 --- /dev/null +++ b/tests/result_tutorial/140/03_rw.json @@ -0,0 +1,9 @@ +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true +} \ No newline at end of file diff --git a/tests/result_tutorial/120/04_ro.json b/tests/result_tutorial/140/04_ro.json similarity index 70% rename from tests/result_tutorial/120/04_ro.json rename to tests/result_tutorial/140/04_ro.json index bbf9a1d..cc3047c 100644 --- a/tests/result_tutorial/120/04_ro.json +++ b/tests/result_tutorial/140/04_ro.json @@ -5,9 +5,7 @@ "manual.use_for_https": true, "manual.https_proxy.address": "http.proxy.net", "manual.https_proxy.port": "8080", - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v4", + "manual.socks_proxy.address": null, "no_proxy": [], "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/120/04_rw.json b/tests/result_tutorial/140/04_rw.json similarity index 63% rename from tests/result_tutorial/120/04_rw.json rename to tests/result_tutorial/140/04_rw.json index 59815c5..dca9f46 100644 --- a/tests/result_tutorial/120/04_rw.json +++ b/tests/result_tutorial/140/04_rw.json @@ -3,9 +3,7 @@ "manual.http_proxy.address": "http.proxy.net", "manual.http_proxy.port": "8080", "manual.use_for_https": true, - "manual.socks_proxy.address": "http.proxy.net", - "manual.socks_proxy.port": "8080", - "manual.socks_proxy.version": "v4", + "manual.socks_proxy.address": null, "no_proxy": [], "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/181/errors_02.json b/tests/result_tutorial/140/errors_02.json similarity index 100% rename from tests/result_tutorial/181/errors_02.json rename to tests/result_tutorial/140/errors_02.json diff --git a/tests/result_tutorial/140/errors_03.json b/tests/result_tutorial/140/errors_03.json new file mode 100644 index 0000000..0dd5bd8 --- /dev/null +++ b/tests/result_tutorial/140/errors_03.json @@ -0,0 +1,12 @@ +{ + "errors": [], + "warnings": [ + [ + [ + "variable has property disabled, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/140/config/03/config.yml\"", + "proxy_dns_socks5", + null + ] + ] + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/140/errors_04.json b/tests/result_tutorial/140/errors_04.json new file mode 100644 index 0000000..6db4218 --- /dev/null +++ b/tests/result_tutorial/140/errors_04.json @@ -0,0 +1,12 @@ +{ + "errors": [], + "warnings": [ + [ + [ + "variable has property disabled, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/140/config/04/config.yml\"", + "manual.socks_proxy.version", + null + ] + ] + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/150/01_ro.json b/tests/result_tutorial/150/01_ro.json index 98f3d7c..5bb5e67 100644 --- a/tests/result_tutorial/150/01_ro.json +++ b/tests/result_tutorial/150/01_ro.json @@ -1,4 +1,3 @@ { - "proxy_mode": "No proxy", - "dns_over_https.enable_dns_over_https": false + "proxy_mode": "No proxy" } \ No newline at end of file diff --git a/tests/result_tutorial/150/01_rw.json b/tests/result_tutorial/150/01_rw.json index 98f3d7c..5bb5e67 100644 --- a/tests/result_tutorial/150/01_rw.json +++ b/tests/result_tutorial/150/01_rw.json @@ -1,4 +1,3 @@ { - "proxy_mode": "No proxy", - "dns_over_https.enable_dns_over_https": false + "proxy_mode": "No proxy" } \ No newline at end of file diff --git a/tests/result_tutorial/150/02_ro.json b/tests/result_tutorial/150/02_ro.json index c8e81d7..cc3047c 100644 --- a/tests/result_tutorial/150/02_ro.json +++ b/tests/result_tutorial/150/02_ro.json @@ -1,5 +1,11 @@ { - "proxy_mode": "No proxy", - "dns_over_https.enable_dns_over_https": true, - "dns_over_https.provider": "Cloudflare" + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.https_proxy.address": "http.proxy.net", + "manual.https_proxy.port": "8080", + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/150/02_rw.json b/tests/result_tutorial/150/02_rw.json index c8e81d7..dca9f46 100644 --- a/tests/result_tutorial/150/02_rw.json +++ b/tests/result_tutorial/150/02_rw.json @@ -1,5 +1,9 @@ { - "proxy_mode": "No proxy", - "dns_over_https.enable_dns_over_https": true, - "dns_over_https.provider": "Cloudflare" + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/150/03_ro.json b/tests/result_tutorial/150/03_ro.json index b889118..cc3047c 100644 --- a/tests/result_tutorial/150/03_ro.json +++ b/tests/result_tutorial/150/03_ro.json @@ -1,9 +1,11 @@ -[ - [ - [ - "mandatory variable but has no value", - "dns_over_https.custom_dns_url", - null - ] - ] -] \ No newline at end of file +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.https_proxy.address": "http.proxy.net", + "manual.https_proxy.port": "8080", + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true +} \ No newline at end of file diff --git a/tests/result_tutorial/150/03_rw.json b/tests/result_tutorial/150/03_rw.json index b889118..dca9f46 100644 --- a/tests/result_tutorial/150/03_rw.json +++ b/tests/result_tutorial/150/03_rw.json @@ -1,9 +1,9 @@ -[ - [ - [ - "mandatory variable but has no value", - "dns_over_https.custom_dns_url", - null - ] - ] -] \ No newline at end of file +{ + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true +} \ No newline at end of file diff --git a/tests/result_tutorial/150/04_ro.json b/tests/result_tutorial/150/04_ro.json index 0d51fba..cc3047c 100644 --- a/tests/result_tutorial/150/04_ro.json +++ b/tests/result_tutorial/150/04_ro.json @@ -1,6 +1,11 @@ { - "proxy_mode": "No proxy", - "dns_over_https.enable_dns_over_https": true, - "dns_over_https.provider": "Custom", - "dns_over_https.custom_dns_url": "https://dns.net" + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.https_proxy.address": "http.proxy.net", + "manual.https_proxy.port": "8080", + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/150/04_rw.json b/tests/result_tutorial/150/04_rw.json index 0d51fba..dca9f46 100644 --- a/tests/result_tutorial/150/04_rw.json +++ b/tests/result_tutorial/150/04_rw.json @@ -1,6 +1,9 @@ { - "proxy_mode": "No proxy", - "dns_over_https.enable_dns_over_https": true, - "dns_over_https.provider": "Custom", - "dns_over_https.custom_dns_url": "https://dns.net" + "proxy_mode": "Manual proxy configuration", + "manual.http_proxy.address": "http.proxy.net", + "manual.http_proxy.port": "8080", + "manual.use_for_https": true, + "manual.socks_proxy.address": null, + "no_proxy": [], + "prompt_authentication": true } \ No newline at end of file diff --git a/tests/result_tutorial/150/errors_03.json b/tests/result_tutorial/150/errors_03.json index 4c65030..a30b325 100644 --- a/tests/result_tutorial/150/errors_03.json +++ b/tests/result_tutorial/150/errors_03.json @@ -3,8 +3,8 @@ "warnings": [ [ [ - "the value \"http://dns.net\" is an invalid URL, must starts with 'https://' only, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/150/config/03/config.yml\"", - "dns_over_https.custom_dns_url", + "variable has property disabled, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/150/config/03/config.yml\"", + "proxy_dns_socks5", null ] ] diff --git a/tests/result_tutorial/150/errors_04.json b/tests/result_tutorial/150/errors_04.json index 217db0a..f4bb3b2 100644 --- a/tests/result_tutorial/150/errors_04.json +++ b/tests/result_tutorial/150/errors_04.json @@ -1,4 +1,12 @@ { "errors": [], - "warnings": [] + "warnings": [ + [ + [ + "variable has property disabled, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/150/config/04/config.yml\"", + "manual.socks_proxy.version", + null + ] + ] + ] } \ No newline at end of file diff --git a/tests/result_tutorial/160/01_ro.json b/tests/result_tutorial/160/01_ro.json index be21665..98f3d7c 100644 --- a/tests/result_tutorial/160/01_ro.json +++ b/tests/result_tutorial/160/01_ro.json @@ -1,5 +1,4 @@ { - "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": true, - "firefox.dns_over_https.provider": "Cloudflare" + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": false } \ No newline at end of file diff --git a/tests/result_tutorial/160/01_rw.json b/tests/result_tutorial/160/01_rw.json index be21665..98f3d7c 100644 --- a/tests/result_tutorial/160/01_rw.json +++ b/tests/result_tutorial/160/01_rw.json @@ -1,5 +1,4 @@ { - "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": true, - "firefox.dns_over_https.provider": "Cloudflare" + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": false } \ No newline at end of file diff --git a/tests/result_tutorial/161/01_ro.json b/tests/result_tutorial/161/01_ro.json index 7dc682d..98f3d7c 100644 --- a/tests/result_tutorial/161/01_ro.json +++ b/tests/result_tutorial/161/01_ro.json @@ -1,4 +1,4 @@ { - "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": false } \ No newline at end of file diff --git a/tests/result_tutorial/161/01_rw.json b/tests/result_tutorial/161/01_rw.json index 7dc682d..98f3d7c 100644 --- a/tests/result_tutorial/161/01_rw.json +++ b/tests/result_tutorial/161/01_rw.json @@ -1,4 +1,4 @@ { - "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": false } \ No newline at end of file diff --git a/tests/result_tutorial/161/02_ro.json b/tests/result_tutorial/161/02_ro.json new file mode 100644 index 0000000..c8e81d7 --- /dev/null +++ b/tests/result_tutorial/161/02_ro.json @@ -0,0 +1,5 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Cloudflare" +} \ No newline at end of file diff --git a/tests/result_tutorial/161/02_rw.json b/tests/result_tutorial/161/02_rw.json new file mode 100644 index 0000000..c8e81d7 --- /dev/null +++ b/tests/result_tutorial/161/02_rw.json @@ -0,0 +1,5 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Cloudflare" +} \ No newline at end of file diff --git a/tests/result_tutorial/182/errors_02.json b/tests/result_tutorial/161/errors_02.json similarity index 100% rename from tests/result_tutorial/182/errors_02.json rename to tests/result_tutorial/161/errors_02.json diff --git a/tests/result_tutorial/162/01_ro.json b/tests/result_tutorial/162/01_ro.json new file mode 100644 index 0000000..98f3d7c --- /dev/null +++ b/tests/result_tutorial/162/01_ro.json @@ -0,0 +1,4 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": false +} \ No newline at end of file diff --git a/tests/result_tutorial/162/01_rw.json b/tests/result_tutorial/162/01_rw.json new file mode 100644 index 0000000..98f3d7c --- /dev/null +++ b/tests/result_tutorial/162/01_rw.json @@ -0,0 +1,4 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": false +} \ No newline at end of file diff --git a/tests/result_tutorial/162/02_ro.json b/tests/result_tutorial/162/02_ro.json new file mode 100644 index 0000000..c8e81d7 --- /dev/null +++ b/tests/result_tutorial/162/02_ro.json @@ -0,0 +1,5 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Cloudflare" +} \ No newline at end of file diff --git a/tests/result_tutorial/162/02_rw.json b/tests/result_tutorial/162/02_rw.json new file mode 100644 index 0000000..c8e81d7 --- /dev/null +++ b/tests/result_tutorial/162/02_rw.json @@ -0,0 +1,5 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Cloudflare" +} \ No newline at end of file diff --git a/tests/result_tutorial/162/03_ro.json b/tests/result_tutorial/162/03_ro.json new file mode 100644 index 0000000..7298de9 --- /dev/null +++ b/tests/result_tutorial/162/03_ro.json @@ -0,0 +1,6 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Custom", + "dns_over_https.custom_dns_url": "http://dns.net" +} \ No newline at end of file diff --git a/tests/result_tutorial/162/03_rw.json b/tests/result_tutorial/162/03_rw.json new file mode 100644 index 0000000..7298de9 --- /dev/null +++ b/tests/result_tutorial/162/03_rw.json @@ -0,0 +1,6 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Custom", + "dns_over_https.custom_dns_url": "http://dns.net" +} \ No newline at end of file diff --git a/tests/result_tutorial/162/04_ro.json b/tests/result_tutorial/162/04_ro.json new file mode 100644 index 0000000..0d51fba --- /dev/null +++ b/tests/result_tutorial/162/04_ro.json @@ -0,0 +1,6 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Custom", + "dns_over_https.custom_dns_url": "https://dns.net" +} \ No newline at end of file diff --git a/tests/result_tutorial/162/04_rw.json b/tests/result_tutorial/162/04_rw.json new file mode 100644 index 0000000..0d51fba --- /dev/null +++ b/tests/result_tutorial/162/04_rw.json @@ -0,0 +1,6 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Custom", + "dns_over_https.custom_dns_url": "https://dns.net" +} \ No newline at end of file diff --git a/tests/result_tutorial/211/errors_02.json b/tests/result_tutorial/162/errors_01.json similarity index 100% rename from tests/result_tutorial/211/errors_02.json rename to tests/result_tutorial/162/errors_01.json diff --git a/tests/result_tutorial/162/errors_02.json b/tests/result_tutorial/162/errors_02.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/162/errors_02.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/162/errors_03.json b/tests/result_tutorial/162/errors_03.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/162/errors_03.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/162/errors_04.json b/tests/result_tutorial/162/errors_04.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/162/errors_04.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/170/01_ro.json b/tests/result_tutorial/170/01_ro.json index 6aa96af..98f3d7c 100644 --- a/tests/result_tutorial/170/01_ro.json +++ b/tests/result_tutorial/170/01_ro.json @@ -1,5 +1,4 @@ { - "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [] + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": false } \ No newline at end of file diff --git a/tests/result_tutorial/170/01_rw.json b/tests/result_tutorial/170/01_rw.json index 6aa96af..98f3d7c 100644 --- a/tests/result_tutorial/170/01_rw.json +++ b/tests/result_tutorial/170/01_rw.json @@ -1,5 +1,4 @@ { - "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [] + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": false } \ No newline at end of file diff --git a/tests/result_tutorial/170/02_ro.json b/tests/result_tutorial/170/02_ro.json index f72749e..c8e81d7 100644 --- a/tests/result_tutorial/170/02_ro.json +++ b/tests/result_tutorial/170/02_ro.json @@ -1,10 +1,5 @@ { - "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [ - { - "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.color": "#66cc66" - } - ] + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Cloudflare" } \ No newline at end of file diff --git a/tests/result_tutorial/170/02_rw.json b/tests/result_tutorial/170/02_rw.json index f72749e..c8e81d7 100644 --- a/tests/result_tutorial/170/02_rw.json +++ b/tests/result_tutorial/170/02_rw.json @@ -1,10 +1,5 @@ { - "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [ - { - "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.color": "#66cc66" - } - ] + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Cloudflare" } \ No newline at end of file diff --git a/tests/result_tutorial/090/02_ro.json b/tests/result_tutorial/170/03_ro.json similarity index 69% rename from tests/result_tutorial/090/02_ro.json rename to tests/result_tutorial/170/03_ro.json index 27e3c98..b889118 100644 --- a/tests/result_tutorial/090/02_ro.json +++ b/tests/result_tutorial/170/03_ro.json @@ -2,7 +2,7 @@ [ [ "mandatory variable but has no value", - "auto", + "dns_over_https.custom_dns_url", null ] ] diff --git a/tests/result_tutorial/090/02_rw.json b/tests/result_tutorial/170/03_rw.json similarity index 69% rename from tests/result_tutorial/090/02_rw.json rename to tests/result_tutorial/170/03_rw.json index 27e3c98..b889118 100644 --- a/tests/result_tutorial/090/02_rw.json +++ b/tests/result_tutorial/170/03_rw.json @@ -2,7 +2,7 @@ [ [ "mandatory variable but has no value", - "auto", + "dns_over_https.custom_dns_url", null ] ] diff --git a/tests/result_tutorial/170/04_ro.json b/tests/result_tutorial/170/04_ro.json new file mode 100644 index 0000000..0d51fba --- /dev/null +++ b/tests/result_tutorial/170/04_ro.json @@ -0,0 +1,6 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Custom", + "dns_over_https.custom_dns_url": "https://dns.net" +} \ No newline at end of file diff --git a/tests/result_tutorial/170/04_rw.json b/tests/result_tutorial/170/04_rw.json new file mode 100644 index 0000000..0d51fba --- /dev/null +++ b/tests/result_tutorial/170/04_rw.json @@ -0,0 +1,6 @@ +{ + "proxy_mode": "No proxy", + "dns_over_https.enable_dns_over_https": true, + "dns_over_https.provider": "Custom", + "dns_over_https.custom_dns_url": "https://dns.net" +} \ No newline at end of file diff --git a/tests/result_tutorial/170/errors_03.json b/tests/result_tutorial/170/errors_03.json new file mode 100644 index 0000000..7251a0c --- /dev/null +++ b/tests/result_tutorial/170/errors_03.json @@ -0,0 +1,12 @@ +{ + "errors": [], + "warnings": [ + [ + [ + "the value \"http://dns.net\" is an invalid URL, must starts with 'https://' only, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/170/config/03/config.yml\"", + "dns_over_https.custom_dns_url", + null + ] + ] + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/170/errors_04.json b/tests/result_tutorial/170/errors_04.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/170/errors_04.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/180/01_ro.json b/tests/result_tutorial/180/01_ro.json index 6aa96af..be21665 100644 --- a/tests/result_tutorial/180/01_ro.json +++ b/tests/result_tutorial/180/01_ro.json @@ -1,5 +1,5 @@ { "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [] + "firefox.dns_over_https.enable_dns_over_https": true, + "firefox.dns_over_https.provider": "Cloudflare" } \ No newline at end of file diff --git a/tests/result_tutorial/180/01_rw.json b/tests/result_tutorial/180/01_rw.json index 6aa96af..be21665 100644 --- a/tests/result_tutorial/180/01_rw.json +++ b/tests/result_tutorial/180/01_rw.json @@ -1,5 +1,5 @@ { "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [] + "firefox.dns_over_https.enable_dns_over_https": true, + "firefox.dns_over_https.provider": "Cloudflare" } \ No newline at end of file diff --git a/tests/result_tutorial/181/01_ro.json b/tests/result_tutorial/181/01_ro.json index 6aa96af..7dc682d 100644 --- a/tests/result_tutorial/181/01_ro.json +++ b/tests/result_tutorial/181/01_ro.json @@ -1,5 +1,4 @@ { "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [] + "firefox.dns_over_https.enable_dns_over_https": false } \ No newline at end of file diff --git a/tests/result_tutorial/181/01_rw.json b/tests/result_tutorial/181/01_rw.json index 6aa96af..7dc682d 100644 --- a/tests/result_tutorial/181/01_rw.json +++ b/tests/result_tutorial/181/01_rw.json @@ -1,5 +1,4 @@ { "firefox.proxy_mode": "No proxy", - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [] + "firefox.dns_over_https.enable_dns_over_https": false } \ No newline at end of file diff --git a/tests/result_tutorial/190/02_ro.json b/tests/result_tutorial/190/02_ro.json index 26ccf89..f72749e 100644 --- a/tests/result_tutorial/190/02_ro.json +++ b/tests/result_tutorial/190/02_ro.json @@ -4,7 +4,6 @@ "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", "foxyproxy.proxies.color": "#66cc66" } ] diff --git a/tests/result_tutorial/190/02_rw.json b/tests/result_tutorial/190/02_rw.json index 26ccf89..f72749e 100644 --- a/tests/result_tutorial/190/02_rw.json +++ b/tests/result_tutorial/190/02_rw.json @@ -4,7 +4,6 @@ "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", "foxyproxy.proxies.color": "#66cc66" } ] diff --git a/tests/result_tutorial/190/03_ro.json b/tests/result_tutorial/190/03_ro.json index 6325e7c..a5fd237 100644 --- a/tests/result_tutorial/190/03_ro.json +++ b/tests/result_tutorial/190/03_ro.json @@ -1,31 +1,17 @@ { - "firefox.proxy_mode": "Manual proxy configuration", - "firefox.manual.http_proxy.address": "http.proxy.net", - "firefox.manual.http_proxy.port": "8080", - "firefox.manual.use_for_https": true, - "firefox.manual.https_proxy.address": "http.proxy.net", - "firefox.manual.https_proxy.port": "8080", - "firefox.manual.socks_proxy.address": "http.proxy.net", - "firefox.manual.socks_proxy.port": "8080", - "firefox.manual.socks_proxy.version": "v5", - "firefox.no_proxy": [], - "firefox.prompt_authentication": true, - "firefox.proxy_dns_socks5": false, + "firefox.proxy_mode": "No proxy", "firefox.dns_over_https.enable_dns_over_https": false, "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", "foxyproxy.proxies.color": "#66cc66" }, { "foxyproxy.proxies.title": "An other company", - "foxyproxy.proxies.type": "SOCKS5", "foxyproxy.proxies.color": "#cc66cc" }, { "foxyproxy.proxies.title": "WPAD", - "foxyproxy.proxies.type": "WPAD", "foxyproxy.proxies.color": "#1166cc" } ] diff --git a/tests/result_tutorial/190/03_rw.json b/tests/result_tutorial/190/03_rw.json index ffe6b2e..a5fd237 100644 --- a/tests/result_tutorial/190/03_rw.json +++ b/tests/result_tutorial/190/03_rw.json @@ -1,29 +1,17 @@ { - "firefox.proxy_mode": "Manual proxy configuration", - "firefox.manual.http_proxy.address": "http.proxy.net", - "firefox.manual.http_proxy.port": "8080", - "firefox.manual.use_for_https": true, - "firefox.manual.socks_proxy.address": "http.proxy.net", - "firefox.manual.socks_proxy.port": "8080", - "firefox.manual.socks_proxy.version": "v5", - "firefox.no_proxy": [], - "firefox.prompt_authentication": true, - "firefox.proxy_dns_socks5": false, + "firefox.proxy_mode": "No proxy", "firefox.dns_over_https.enable_dns_over_https": false, "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", "foxyproxy.proxies.color": "#66cc66" }, { "foxyproxy.proxies.title": "An other company", - "foxyproxy.proxies.type": "SOCKS5", "foxyproxy.proxies.color": "#cc66cc" }, { "foxyproxy.proxies.title": "WPAD", - "foxyproxy.proxies.type": "WPAD", "foxyproxy.proxies.color": "#1166cc" } ] diff --git a/tests/result_tutorial/200/02_ro.json b/tests/result_tutorial/200/02_ro.json index fac888a..f72749e 100644 --- a/tests/result_tutorial/200/02_ro.json +++ b/tests/result_tutorial/200/02_ro.json @@ -4,10 +4,7 @@ "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#66cc66", - "foxyproxy.proxies.address": "proxy.company.net", - "foxyproxy.proxies.port": "8080" + "foxyproxy.proxies.color": "#66cc66" } ] } \ No newline at end of file diff --git a/tests/result_tutorial/200/02_rw.json b/tests/result_tutorial/200/02_rw.json index fac888a..f72749e 100644 --- a/tests/result_tutorial/200/02_rw.json +++ b/tests/result_tutorial/200/02_rw.json @@ -4,10 +4,7 @@ "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#66cc66", - "foxyproxy.proxies.address": "proxy.company.net", - "foxyproxy.proxies.port": "8080" + "foxyproxy.proxies.color": "#66cc66" } ] } \ No newline at end of file diff --git a/tests/result_tutorial/200/03_ro.json b/tests/result_tutorial/200/03_ro.json index 06fa1be..b4be66d 100644 --- a/tests/result_tutorial/200/03_ro.json +++ b/tests/result_tutorial/200/03_ro.json @@ -1,24 +1,9 @@ -{ - "firefox.proxy_mode": "Manual proxy configuration", - "firefox.manual.http_proxy.address": "http.proxy.net", - "firefox.manual.http_proxy.port": "3128", - "firefox.manual.use_for_https": false, - "firefox.manual.https_proxy.address": "https.proxy.net", - "firefox.manual.https_proxy.port": "3128", - "firefox.manual.socks_proxy.address": "http.proxy.net", - "firefox.manual.socks_proxy.port": "3128", - "firefox.manual.socks_proxy.version": "v5", - "firefox.no_proxy": [], - "firefox.prompt_authentication": true, - "firefox.proxy_dns_socks5": false, - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [ - { - "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#66cc66", - "foxyproxy.proxies.address": "http.proxy.net", - "foxyproxy.proxies.port": "3128" - } +[ + [ + [ + "mandatory variable at index \"0\" but has no value", + "foxyproxy.proxies.color", + 0 + ] ] -} \ No newline at end of file +] \ No newline at end of file diff --git a/tests/result_tutorial/200/03_rw.json b/tests/result_tutorial/200/03_rw.json index 06fa1be..f229a8a 100644 --- a/tests/result_tutorial/200/03_rw.json +++ b/tests/result_tutorial/200/03_rw.json @@ -1,24 +1,9 @@ -{ - "firefox.proxy_mode": "Manual proxy configuration", - "firefox.manual.http_proxy.address": "http.proxy.net", - "firefox.manual.http_proxy.port": "3128", - "firefox.manual.use_for_https": false, - "firefox.manual.https_proxy.address": "https.proxy.net", - "firefox.manual.https_proxy.port": "3128", - "firefox.manual.socks_proxy.address": "http.proxy.net", - "firefox.manual.socks_proxy.port": "3128", - "firefox.manual.socks_proxy.version": "v5", - "firefox.no_proxy": [], - "firefox.prompt_authentication": true, - "firefox.proxy_dns_socks5": false, - "firefox.dns_over_https.enable_dns_over_https": false, - "foxyproxy.proxies.title": [ - { - "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#66cc66", - "foxyproxy.proxies.address": "http.proxy.net", - "foxyproxy.proxies.port": "3128" - } +[ + [ + [ + "mandatory variable but has no value", + "foxyproxy.proxies.color", + 0 + ] ] -} \ No newline at end of file +] \ No newline at end of file diff --git a/tests/result_tutorial/200/errors_03.json b/tests/result_tutorial/200/errors_03.json index 217db0a..2a31f79 100644 --- a/tests/result_tutorial/200/errors_03.json +++ b/tests/result_tutorial/200/errors_03.json @@ -1,4 +1,12 @@ { "errors": [], - "warnings": [] + "warnings": [ + [ + [ + "the value \"not a color\" is an invalid string, invalid value, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/200/config/03/config.yml\"", + "foxyproxy.proxies.color", + null + ] + ] + ] } \ No newline at end of file diff --git a/tests/result_tutorial/182/01_ro.json b/tests/result_tutorial/201/01_ro.json similarity index 100% rename from tests/result_tutorial/182/01_ro.json rename to tests/result_tutorial/201/01_ro.json diff --git a/tests/result_tutorial/182/01_rw.json b/tests/result_tutorial/201/01_rw.json similarity index 100% rename from tests/result_tutorial/182/01_rw.json rename to tests/result_tutorial/201/01_rw.json diff --git a/tests/result_tutorial/182/02_ro.json b/tests/result_tutorial/201/02_ro.json similarity index 99% rename from tests/result_tutorial/182/02_ro.json rename to tests/result_tutorial/201/02_ro.json index 20246c3..9aa4828 100644 --- a/tests/result_tutorial/182/02_ro.json +++ b/tests/result_tutorial/201/02_ro.json @@ -7,4 +7,4 @@ "foxyproxy.proxies.color": "#9b3677" } ] -} \ No newline at end of file +} diff --git a/tests/result_tutorial/182/02_rw.json b/tests/result_tutorial/201/02_rw.json similarity index 99% rename from tests/result_tutorial/182/02_rw.json rename to tests/result_tutorial/201/02_rw.json index 20246c3..9aa4828 100644 --- a/tests/result_tutorial/182/02_rw.json +++ b/tests/result_tutorial/201/02_rw.json @@ -7,4 +7,4 @@ "foxyproxy.proxies.color": "#9b3677" } ] -} \ No newline at end of file +} diff --git a/tests/result_tutorial/181/03_ro.json b/tests/result_tutorial/201/03_ro.json similarity index 99% rename from tests/result_tutorial/181/03_ro.json rename to tests/result_tutorial/201/03_ro.json index 20246c3..9aa4828 100644 --- a/tests/result_tutorial/181/03_ro.json +++ b/tests/result_tutorial/201/03_ro.json @@ -7,4 +7,4 @@ "foxyproxy.proxies.color": "#9b3677" } ] -} \ No newline at end of file +} diff --git a/tests/result_tutorial/181/03_rw.json b/tests/result_tutorial/201/03_rw.json similarity index 99% rename from tests/result_tutorial/181/03_rw.json rename to tests/result_tutorial/201/03_rw.json index 20246c3..9aa4828 100644 --- a/tests/result_tutorial/181/03_rw.json +++ b/tests/result_tutorial/201/03_rw.json @@ -7,4 +7,4 @@ "foxyproxy.proxies.color": "#9b3677" } ] -} \ No newline at end of file +} diff --git a/tests/result_tutorial/201/errors_01.json b/tests/result_tutorial/201/errors_01.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/201/errors_01.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/201/errors_02.json b/tests/result_tutorial/201/errors_02.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/201/errors_02.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/201/errors_03.json b/tests/result_tutorial/201/errors_03.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/201/errors_03.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/211/01_ro.json b/tests/result_tutorial/202/01_ro.json similarity index 100% rename from tests/result_tutorial/211/01_ro.json rename to tests/result_tutorial/202/01_ro.json diff --git a/tests/result_tutorial/211/01_rw.json b/tests/result_tutorial/202/01_rw.json similarity index 100% rename from tests/result_tutorial/211/01_rw.json rename to tests/result_tutorial/202/01_rw.json diff --git a/tests/result_tutorial/181/02_ro.json b/tests/result_tutorial/202/02_ro.json similarity index 99% rename from tests/result_tutorial/181/02_ro.json rename to tests/result_tutorial/202/02_ro.json index 20246c3..9aa4828 100644 --- a/tests/result_tutorial/181/02_ro.json +++ b/tests/result_tutorial/202/02_ro.json @@ -7,4 +7,4 @@ "foxyproxy.proxies.color": "#9b3677" } ] -} \ No newline at end of file +} diff --git a/tests/result_tutorial/181/02_rw.json b/tests/result_tutorial/202/02_rw.json similarity index 99% rename from tests/result_tutorial/181/02_rw.json rename to tests/result_tutorial/202/02_rw.json index 20246c3..9aa4828 100644 --- a/tests/result_tutorial/181/02_rw.json +++ b/tests/result_tutorial/202/02_rw.json @@ -7,4 +7,4 @@ "foxyproxy.proxies.color": "#9b3677" } ] -} \ No newline at end of file +} diff --git a/tests/result_tutorial/202/errors_01.json b/tests/result_tutorial/202/errors_01.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/202/errors_01.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/202/errors_02.json b/tests/result_tutorial/202/errors_02.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/202/errors_02.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/210/02_ro.json b/tests/result_tutorial/210/02_ro.json index f1c5cae..20246c3 100644 --- a/tests/result_tutorial/210/02_ro.json +++ b/tests/result_tutorial/210/02_ro.json @@ -4,21 +4,7 @@ "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#66cc66", - "foxyproxy.proxies.address": "proxy.company.net", - "foxyproxy.proxies.port": "8080", - "foxyproxy.proxies.username": "one_user", - "foxyproxy.proxies.password": "P4ssW0rD" - }, - { - "foxyproxy.proxies.title": "An other company", - "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#9b3677", - "foxyproxy.proxies.address": "proxy.company.net", - "foxyproxy.proxies.port": "8080", - "foxyproxy.proxies.username": null, - "foxyproxy.proxies.password": null + "foxyproxy.proxies.color": "#9b3677" } ] } \ No newline at end of file diff --git a/tests/result_tutorial/210/02_rw.json b/tests/result_tutorial/210/02_rw.json index f1c5cae..20246c3 100644 --- a/tests/result_tutorial/210/02_rw.json +++ b/tests/result_tutorial/210/02_rw.json @@ -4,21 +4,7 @@ "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", - "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#66cc66", - "foxyproxy.proxies.address": "proxy.company.net", - "foxyproxy.proxies.port": "8080", - "foxyproxy.proxies.username": "one_user", - "foxyproxy.proxies.password": "P4ssW0rD" - }, - { - "foxyproxy.proxies.title": "An other company", - "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#9b3677", - "foxyproxy.proxies.address": "proxy.company.net", - "foxyproxy.proxies.port": "8080", - "foxyproxy.proxies.username": null, - "foxyproxy.proxies.password": null + "foxyproxy.proxies.color": "#9b3677" } ] } \ No newline at end of file diff --git a/tests/result_tutorial/210/03_ro.json b/tests/result_tutorial/210/03_ro.json index 12d7958..30036a7 100644 --- a/tests/result_tutorial/210/03_ro.json +++ b/tests/result_tutorial/210/03_ro.json @@ -1,9 +1,29 @@ -[ - [ - [ - "mandatory variable at index \"0\" but has no value", - "foxyproxy.proxies.username", - 0 - ] +{ + "firefox.proxy_mode": "Manual proxy configuration", + "firefox.manual.http_proxy.address": "http.proxy.net", + "firefox.manual.http_proxy.port": "8080", + "firefox.manual.use_for_https": true, + "firefox.manual.https_proxy.address": "http.proxy.net", + "firefox.manual.https_proxy.port": "8080", + "firefox.manual.socks_proxy.address": null, + "firefox.no_proxy": [], + "firefox.prompt_authentication": true, + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3677" + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "SOCKS5", + "foxyproxy.proxies.color": "#9b3678" + }, + { + "foxyproxy.proxies.title": "WPAD", + "foxyproxy.proxies.type": "WPAD", + "foxyproxy.proxies.color": "#9b3679" + } ] -] \ No newline at end of file +} diff --git a/tests/result_tutorial/210/03_rw.json b/tests/result_tutorial/210/03_rw.json index 66cb287..5e4b63a 100644 --- a/tests/result_tutorial/210/03_rw.json +++ b/tests/result_tutorial/210/03_rw.json @@ -1,9 +1,27 @@ -[ - [ - [ - "mandatory variable but has no value", - "foxyproxy.proxies.username", - 0 - ] +{ + "firefox.proxy_mode": "Manual proxy configuration", + "firefox.manual.http_proxy.address": "http.proxy.net", + "firefox.manual.http_proxy.port": "8080", + "firefox.manual.use_for_https": true, + "firefox.manual.socks_proxy.address": null, + "firefox.no_proxy": [], + "firefox.prompt_authentication": true, + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3677" + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "SOCKS5", + "foxyproxy.proxies.color": "#9b3678" + }, + { + "foxyproxy.proxies.title": "WPAD", + "foxyproxy.proxies.type": "WPAD", + "foxyproxy.proxies.color": "#9b3679" + } ] -] \ No newline at end of file +} diff --git a/tests/result_tutorial/220/01_ro.json b/tests/result_tutorial/220/01_ro.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/220/01_ro.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/220/01_rw.json b/tests/result_tutorial/220/01_rw.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/220/01_rw.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/180/02_ro.json b/tests/result_tutorial/220/02_ro.json similarity index 85% rename from tests/result_tutorial/180/02_ro.json rename to tests/result_tutorial/220/02_ro.json index f72749e..26ccf89 100644 --- a/tests/result_tutorial/180/02_ro.json +++ b/tests/result_tutorial/220/02_ro.json @@ -4,6 +4,7 @@ "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", "foxyproxy.proxies.color": "#66cc66" } ] diff --git a/tests/result_tutorial/180/02_rw.json b/tests/result_tutorial/220/02_rw.json similarity index 85% rename from tests/result_tutorial/180/02_rw.json rename to tests/result_tutorial/220/02_rw.json index f72749e..26ccf89 100644 --- a/tests/result_tutorial/180/02_rw.json +++ b/tests/result_tutorial/220/02_rw.json @@ -4,6 +4,7 @@ "foxyproxy.proxies.title": [ { "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", "foxyproxy.proxies.color": "#66cc66" } ] diff --git a/tests/result_tutorial/220/03_ro.json b/tests/result_tutorial/220/03_ro.json new file mode 100644 index 0000000..580d14b --- /dev/null +++ b/tests/result_tutorial/220/03_ro.json @@ -0,0 +1,29 @@ +{ + "firefox.proxy_mode": "Manual proxy configuration", + "firefox.manual.http_proxy.address": "http.proxy.net", + "firefox.manual.http_proxy.port": "8080", + "firefox.manual.use_for_https": true, + "firefox.manual.https_proxy.address": "http.proxy.net", + "firefox.manual.https_proxy.port": "8080", + "firefox.manual.socks_proxy.address": null, + "firefox.no_proxy": [], + "firefox.prompt_authentication": true, + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#66cc66" + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "SOCKS5", + "foxyproxy.proxies.color": "#cc66cc" + }, + { + "foxyproxy.proxies.title": "WPAD", + "foxyproxy.proxies.type": "WPAD", + "foxyproxy.proxies.color": "#1166cc" + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/220/03_rw.json b/tests/result_tutorial/220/03_rw.json new file mode 100644 index 0000000..73c3923 --- /dev/null +++ b/tests/result_tutorial/220/03_rw.json @@ -0,0 +1,27 @@ +{ + "firefox.proxy_mode": "Manual proxy configuration", + "firefox.manual.http_proxy.address": "http.proxy.net", + "firefox.manual.http_proxy.port": "8080", + "firefox.manual.use_for_https": true, + "firefox.manual.socks_proxy.address": null, + "firefox.no_proxy": [], + "firefox.prompt_authentication": true, + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#66cc66" + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "SOCKS5", + "foxyproxy.proxies.color": "#cc66cc" + }, + { + "foxyproxy.proxies.title": "WPAD", + "foxyproxy.proxies.type": "WPAD", + "foxyproxy.proxies.color": "#1166cc" + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/220/errors_01.json b/tests/result_tutorial/220/errors_01.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/220/errors_01.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/220/errors_02.json b/tests/result_tutorial/220/errors_02.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/220/errors_02.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/220/errors_03.json b/tests/result_tutorial/220/errors_03.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/220/errors_03.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/01_ro.json b/tests/result_tutorial/230/01_ro.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/230/01_ro.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/01_rw.json b/tests/result_tutorial/230/01_rw.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/230/01_rw.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/02_ro.json b/tests/result_tutorial/230/02_ro.json new file mode 100644 index 0000000..05eae3a --- /dev/null +++ b/tests/result_tutorial/230/02_ro.json @@ -0,0 +1,16 @@ +[ + [ + [ + "mandatory variable at index \"0\" but has no value", + "foxyproxy.proxies.address", + 0 + ] + ], + [ + [ + "mandatory variable at index \"0\" but has no value", + "foxyproxy.proxies.port", + 0 + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/230/02_rw.json b/tests/result_tutorial/230/02_rw.json new file mode 100644 index 0000000..5263585 --- /dev/null +++ b/tests/result_tutorial/230/02_rw.json @@ -0,0 +1,16 @@ +[ + [ + [ + "mandatory variable but has no value", + "foxyproxy.proxies.address", + 0 + ] + ], + [ + [ + "mandatory variable but has no value", + "foxyproxy.proxies.port", + 0 + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/230/03_ro.json b/tests/result_tutorial/230/03_ro.json new file mode 100644 index 0000000..fac888a --- /dev/null +++ b/tests/result_tutorial/230/03_ro.json @@ -0,0 +1,13 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#66cc66", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080" + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/03_rw.json b/tests/result_tutorial/230/03_rw.json new file mode 100644 index 0000000..fac888a --- /dev/null +++ b/tests/result_tutorial/230/03_rw.json @@ -0,0 +1,13 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#66cc66", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080" + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/04_ro.json b/tests/result_tutorial/230/04_ro.json new file mode 100644 index 0000000..d1f595a --- /dev/null +++ b/tests/result_tutorial/230/04_ro.json @@ -0,0 +1,21 @@ +{ + "firefox.proxy_mode": "Manual proxy configuration", + "firefox.manual.http_proxy.address": "http.proxy.net", + "firefox.manual.http_proxy.port": "3128", + "firefox.manual.use_for_https": false, + "firefox.manual.https_proxy.address": "https.proxy.net", + "firefox.manual.https_proxy.port": "3128", + "firefox.manual.socks_proxy.address": null, + "firefox.no_proxy": [], + "firefox.prompt_authentication": true, + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#66cc66", + "foxyproxy.proxies.address": "http.proxy.net", + "foxyproxy.proxies.port": "3128" + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/04_rw.json b/tests/result_tutorial/230/04_rw.json new file mode 100644 index 0000000..d1f595a --- /dev/null +++ b/tests/result_tutorial/230/04_rw.json @@ -0,0 +1,21 @@ +{ + "firefox.proxy_mode": "Manual proxy configuration", + "firefox.manual.http_proxy.address": "http.proxy.net", + "firefox.manual.http_proxy.port": "3128", + "firefox.manual.use_for_https": false, + "firefox.manual.https_proxy.address": "https.proxy.net", + "firefox.manual.https_proxy.port": "3128", + "firefox.manual.socks_proxy.address": null, + "firefox.no_proxy": [], + "firefox.prompt_authentication": true, + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#66cc66", + "foxyproxy.proxies.address": "http.proxy.net", + "foxyproxy.proxies.port": "3128" + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/errors_01.json b/tests/result_tutorial/230/errors_01.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/230/errors_01.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/errors_02.json b/tests/result_tutorial/230/errors_02.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/230/errors_02.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/errors_03.json b/tests/result_tutorial/230/errors_03.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/230/errors_03.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/230/errors_04.json b/tests/result_tutorial/230/errors_04.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/230/errors_04.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/231/01_ro.json b/tests/result_tutorial/231/01_ro.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/231/01_ro.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/231/01_rw.json b/tests/result_tutorial/231/01_rw.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/231/01_rw.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/211/02_ro.json b/tests/result_tutorial/231/02_ro.json similarity index 94% rename from tests/result_tutorial/211/02_ro.json rename to tests/result_tutorial/231/02_ro.json index f1c5cae..a06effe 100644 --- a/tests/result_tutorial/211/02_ro.json +++ b/tests/result_tutorial/231/02_ro.json @@ -14,7 +14,7 @@ { "foxyproxy.proxies.title": "An other company", "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.color": "#f001fd", "foxyproxy.proxies.address": "proxy.company.net", "foxyproxy.proxies.port": "8080", "foxyproxy.proxies.username": null, diff --git a/tests/result_tutorial/211/02_rw.json b/tests/result_tutorial/231/02_rw.json similarity index 94% rename from tests/result_tutorial/211/02_rw.json rename to tests/result_tutorial/231/02_rw.json index ee9c530..67d70bf 100644 --- a/tests/result_tutorial/211/02_rw.json +++ b/tests/result_tutorial/231/02_rw.json @@ -14,7 +14,7 @@ { "foxyproxy.proxies.title": "An other company", "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.color": "#f001fd", "foxyproxy.proxies.address": "proxy.company.net", "foxyproxy.proxies.port": "8080", "foxyproxy.proxies.username": null diff --git a/tests/result_tutorial/211/03_ro.json b/tests/result_tutorial/231/03_ro.json similarity index 94% rename from tests/result_tutorial/211/03_ro.json rename to tests/result_tutorial/231/03_ro.json index 12c95a9..380d59a 100644 --- a/tests/result_tutorial/211/03_ro.json +++ b/tests/result_tutorial/231/03_ro.json @@ -14,7 +14,7 @@ { "foxyproxy.proxies.title": "An other company", "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.color": "#102eb1", "foxyproxy.proxies.address": "proxy.company.net", "foxyproxy.proxies.port": "8080", "foxyproxy.proxies.username": null, diff --git a/tests/result_tutorial/211/03_rw.json b/tests/result_tutorial/231/03_rw.json similarity index 93% rename from tests/result_tutorial/211/03_rw.json rename to tests/result_tutorial/231/03_rw.json index a9e6cf5..8a080e6 100644 --- a/tests/result_tutorial/211/03_rw.json +++ b/tests/result_tutorial/231/03_rw.json @@ -13,7 +13,7 @@ { "foxyproxy.proxies.title": "An other company", "foxyproxy.proxies.type": "HTTP", - "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.color": "#102eb1", "foxyproxy.proxies.address": "proxy.company.net", "foxyproxy.proxies.port": "8080", "foxyproxy.proxies.username": null diff --git a/tests/result_tutorial/231/errors_01.json b/tests/result_tutorial/231/errors_01.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/231/errors_01.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/231/errors_02.json b/tests/result_tutorial/231/errors_02.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/231/errors_02.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/211/errors_03.json b/tests/result_tutorial/231/errors_03.json similarity index 82% rename from tests/result_tutorial/211/errors_03.json rename to tests/result_tutorial/231/errors_03.json index 7def961..6054f8f 100644 --- a/tests/result_tutorial/211/errors_03.json +++ b/tests/result_tutorial/231/errors_03.json @@ -3,7 +3,7 @@ "warnings": [ [ [ - "variable \"password\" (Password) at index \"0\" is hidden, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/211/config/03/config.yml\"", + "variable \"password\" (Password) at index \"0\" is hidden, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/231/config/03/config.yml\"", "foxyproxy.proxies.password", null ] diff --git a/tests/result_tutorial/240/01_ro.json b/tests/result_tutorial/240/01_ro.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/240/01_ro.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/240/01_rw.json b/tests/result_tutorial/240/01_rw.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/240/01_rw.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/240/02_ro.json b/tests/result_tutorial/240/02_ro.json new file mode 100644 index 0000000..f416115 --- /dev/null +++ b/tests/result_tutorial/240/02_ro.json @@ -0,0 +1,24 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": "one_user", + "foxyproxy.proxies.password": "P4ssW0rD" + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3678", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": null, + "foxyproxy.proxies.password": null + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/240/02_rw.json b/tests/result_tutorial/240/02_rw.json new file mode 100644 index 0000000..f416115 --- /dev/null +++ b/tests/result_tutorial/240/02_rw.json @@ -0,0 +1,24 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": "one_user", + "foxyproxy.proxies.password": "P4ssW0rD" + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3678", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": null, + "foxyproxy.proxies.password": null + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/240/03_ro.json b/tests/result_tutorial/240/03_ro.json new file mode 100644 index 0000000..12d7958 --- /dev/null +++ b/tests/result_tutorial/240/03_ro.json @@ -0,0 +1,9 @@ +[ + [ + [ + "mandatory variable at index \"0\" but has no value", + "foxyproxy.proxies.username", + 0 + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/240/03_rw.json b/tests/result_tutorial/240/03_rw.json new file mode 100644 index 0000000..66cb287 --- /dev/null +++ b/tests/result_tutorial/240/03_rw.json @@ -0,0 +1,9 @@ +[ + [ + [ + "mandatory variable but has no value", + "foxyproxy.proxies.username", + 0 + ] + ] +] \ No newline at end of file diff --git a/tests/result_tutorial/240/errors_01.json b/tests/result_tutorial/240/errors_01.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/240/errors_01.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/240/errors_02.json b/tests/result_tutorial/240/errors_02.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/240/errors_02.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/240/errors_03.json b/tests/result_tutorial/240/errors_03.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/240/errors_03.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/01_ro.json b/tests/result_tutorial/241/01_ro.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/241/01_ro.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/01_rw.json b/tests/result_tutorial/241/01_rw.json new file mode 100644 index 0000000..6aa96af --- /dev/null +++ b/tests/result_tutorial/241/01_rw.json @@ -0,0 +1,5 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/02_ro.json b/tests/result_tutorial/241/02_ro.json new file mode 100644 index 0000000..f416115 --- /dev/null +++ b/tests/result_tutorial/241/02_ro.json @@ -0,0 +1,24 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": "one_user", + "foxyproxy.proxies.password": "P4ssW0rD" + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3678", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": null, + "foxyproxy.proxies.password": null + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/02_rw.json b/tests/result_tutorial/241/02_rw.json new file mode 100644 index 0000000..b05b261 --- /dev/null +++ b/tests/result_tutorial/241/02_rw.json @@ -0,0 +1,23 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": "one_user", + "foxyproxy.proxies.password": "P4ssW0rD" + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3678", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": null + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/03_ro.json b/tests/result_tutorial/241/03_ro.json new file mode 100644 index 0000000..e76423a --- /dev/null +++ b/tests/result_tutorial/241/03_ro.json @@ -0,0 +1,24 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": null, + "foxyproxy.proxies.password": null + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3678", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": null, + "foxyproxy.proxies.password": null + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/03_rw.json b/tests/result_tutorial/241/03_rw.json new file mode 100644 index 0000000..53ce920 --- /dev/null +++ b/tests/result_tutorial/241/03_rw.json @@ -0,0 +1,22 @@ +{ + "firefox.proxy_mode": "No proxy", + "firefox.dns_over_https.enable_dns_over_https": false, + "foxyproxy.proxies.title": [ + { + "foxyproxy.proxies.title": "My company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3677", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": null + }, + { + "foxyproxy.proxies.title": "An other company", + "foxyproxy.proxies.type": "HTTP", + "foxyproxy.proxies.color": "#9b3678", + "foxyproxy.proxies.address": "proxy.company.net", + "foxyproxy.proxies.port": "8080", + "foxyproxy.proxies.username": null + } + ] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/errors_01.json b/tests/result_tutorial/241/errors_01.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/241/errors_01.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/errors_02.json b/tests/result_tutorial/241/errors_02.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/result_tutorial/241/errors_02.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/result_tutorial/241/errors_03.json b/tests/result_tutorial/241/errors_03.json new file mode 100644 index 0000000..5e91313 --- /dev/null +++ b/tests/result_tutorial/241/errors_03.json @@ -0,0 +1,12 @@ +{ + "errors": [], + "warnings": [ + [ + [ + "variable \"password\" (Password) at index \"0\" is hidden, it will be ignored when loading from the YAML file \"../rougail-tutorials_builder/examples/241/config/03/config.yml\"", + "foxyproxy.proxies.password", + null + ] + ] + ] +} \ No newline at end of file diff --git a/tests/results/00_9default_calculation/makedict/mandatories.json b/tests/results/00_9default_calculation/makedict/mandatories.json index a5a3e6b..2b34a62 100644 --- a/tests/results/00_9default_calculation/makedict/mandatories.json +++ b/tests/results/00_9default_calculation/makedict/mandatories.json @@ -1,3 +1,3 @@ { - "rougail.variable": "string_1_True_" + "rougail.variable": "string_1_True_None" } diff --git a/tests/results/60_0family_dynamic_variable/errors/all.json b/tests/results/60_0family_dynamic_variable/errors/all.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/60_0family_dynamic_variable/errors/all.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_variable/errors/mandatories.json b/tests/results/60_0family_dynamic_variable/errors/mandatories.json new file mode 100644 index 0000000..217db0a --- /dev/null +++ b/tests/results/60_0family_dynamic_variable/errors/mandatories.json @@ -0,0 +1,4 @@ +{ + "errors": [], + "warnings": [] +} \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_variable/file/all.yml b/tests/results/60_0family_dynamic_variable/file/all.yml new file mode 100644 index 0000000..dd49ffb --- /dev/null +++ b/tests/results/60_0family_dynamic_variable/file/all.yml @@ -0,0 +1,14 @@ +{ + "rougail": { + "var": [ + "val1", + "val2" + ], + "dynval1": { + "variable": "string1" + }, + "dynval2": { + "variable": "string1" + } + } +} \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_variable/file/all_exclude.yml b/tests/results/60_0family_dynamic_variable/file/all_exclude.yml new file mode 100644 index 0000000..a0d7d41 --- /dev/null +++ b/tests/results/60_0family_dynamic_variable/file/all_exclude.yml @@ -0,0 +1,10 @@ +{ + "rougail": { + "dynval1": { + "variable": "string1" + }, + "dynval2": { + "variable": "string1" + } + } +} \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_variable/file/mandatories.yml b/tests/results/60_0family_dynamic_variable/file/mandatories.yml new file mode 100644 index 0000000..a0d7d41 --- /dev/null +++ b/tests/results/60_0family_dynamic_variable/file/mandatories.yml @@ -0,0 +1,10 @@ +{ + "rougail": { + "dynval1": { + "variable": "string1" + }, + "dynval2": { + "variable": "string1" + } + } +} \ No newline at end of file diff --git a/tests/results/60_0family_dynamic_variable/makedict/all.json b/tests/results/60_0family_dynamic_variable/makedict/all.json new file mode 100644 index 0000000..9328dc5 --- /dev/null +++ b/tests/results/60_0family_dynamic_variable/makedict/all.json @@ -0,0 +1,8 @@ +{ + "rougail.var": [ + "val1", + "val2" + ], + "rougail.dynval1.variable": "string1", + "rougail.dynval2.variable": "string1" +} diff --git a/tests/results/60_0family_dynamic_variable/makedict/mandatories.json b/tests/results/60_0family_dynamic_variable/makedict/mandatories.json new file mode 100644 index 0000000..9328dc5 --- /dev/null +++ b/tests/results/60_0family_dynamic_variable/makedict/mandatories.json @@ -0,0 +1,8 @@ +{ + "rougail.var": [ + "val1", + "val2" + ], + "rougail.dynval1.variable": "string1", + "rougail.dynval2.variable": "string1" +} diff --git a/tests/test_tutorial.py b/tests/test_tutorial.py index 41e21de..3202a7e 100644 --- a/tests/test_tutorial.py +++ b/tests/test_tutorial.py @@ -97,10 +97,16 @@ def test_tutorial(): config_dict[i] = [[l, v.path, v.index] for l, v in d.items()] else: config_dict = dict(config_to_dict(config.value.get())) - if src_exercice.name in ['181', '182'] and src_config.name in ['02', '03']: +# if src_exercice.name in ['181', '182'] and src_config.name in ['02', '03']: +# config_dict['foxyproxy.proxies.title'][0]['foxyproxy.proxies.color'] = '#9b3677' + if src_exercice.name in ['201', '202', '210', '240', '241'] and src_config.name in ['02', '03']: config_dict['foxyproxy.proxies.title'][0]['foxyproxy.proxies.color'] = '#9b3677' - if src_exercice.name in ['210', '211'] and src_config.name in ['02', '03']: - config_dict['foxyproxy.proxies.title'][1]['foxyproxy.proxies.color'] = '#9b3677' + if src_exercice.name in ['210', '241'] and src_config.name in ['03']: + config_dict['foxyproxy.proxies.title'][1]['foxyproxy.proxies.color'] = '#9b3678' + if src_exercice.name in ['240', '241'] and src_config.name in ['02']: + config_dict['foxyproxy.proxies.title'][1]['foxyproxy.proxies.color'] = '#9b3678' + if src_exercice.name in ['210'] and src_config.name in ['03']: + config_dict['foxyproxy.proxies.title'][2]['foxyproxy.proxies.color'] = '#9b3679' if not result_file.is_file(): with result_file.open('a') as json_file: dump(config_dict, json_file, indent=4)