diff --git a/tests/results_mode/advanced_example.adoc b/tests/results_mode/advanced_example.adoc new file mode 100644 index 000000000..c57210908 --- /dev/null +++ b/tests/results_mode/advanced_example.adoc @@ -0,0 +1,17 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +var1: example +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +var1: example +var2: example +---- diff --git a/tests/mode_advanced.adoc b/tests/results_mode/advanced_variables.adoc similarity index 100% rename from tests/mode_advanced.adoc rename to tests/results_mode/advanced_variables.adoc diff --git a/tests/results_mode/basic_advanced_example.adoc b/tests/results_mode/basic_advanced_example.adoc new file mode 100644 index 000000000..9f732a61f --- /dev/null +++ b/tests/results_mode/basic_advanced_example.adoc @@ -0,0 +1,16 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +var2: example +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +var2: example +---- diff --git a/tests/mode_basic_advanced.adoc b/tests/results_mode/basic_advanced_variables.adoc similarity index 100% rename from tests/mode_basic_advanced.adoc rename to tests/results_mode/basic_advanced_variables.adoc diff --git a/tests/results_mode/basic_example.adoc b/tests/results_mode/basic_example.adoc new file mode 100644 index 000000000..4d3880e1d --- /dev/null +++ b/tests/results_mode/basic_example.adoc @@ -0,0 +1,18 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +var2: example +var3: example +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +var2: example +var3: example +---- diff --git a/tests/results_mode/basic_standard_example.adoc b/tests/results_mode/basic_standard_example.adoc new file mode 100644 index 000000000..11401e91b --- /dev/null +++ b/tests/results_mode/basic_standard_example.adoc @@ -0,0 +1,16 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +var3: example +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +var3: example +---- diff --git a/tests/mode_basic_standard.adoc b/tests/results_mode/basic_standard_variables.adoc similarity index 100% rename from tests/mode_basic_standard.adoc rename to tests/results_mode/basic_standard_variables.adoc diff --git a/tests/mode_basic.adoc b/tests/results_mode/basic_variables.adoc similarity index 100% rename from tests/mode_basic.adoc rename to tests/results_mode/basic_variables.adoc diff --git a/tests/results_mode/standard_advanced_example.adoc b/tests/results_mode/standard_advanced_example.adoc new file mode 100644 index 000000000..95789f52a --- /dev/null +++ b/tests/results_mode/standard_advanced_example.adoc @@ -0,0 +1,16 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +var1: example +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +var1: example +---- diff --git a/tests/mode_standard_advanced.adoc b/tests/results_mode/standard_advanced_variables.adoc similarity index 100% rename from tests/mode_standard_advanced.adoc rename to tests/results_mode/standard_advanced_variables.adoc diff --git a/tests/results_mode/standard_example.adoc b/tests/results_mode/standard_example.adoc new file mode 100644 index 000000000..e93bc8844 --- /dev/null +++ b/tests/results_mode/standard_example.adoc @@ -0,0 +1,18 @@ +== Example with mandatory variables not filled in + +[,yaml] +---- +--- +var1: example +var3: example +---- + + +== Example with all variables modifiable + +[,yaml] +---- +--- +var1: example +var3: example +---- diff --git a/tests/mode_standard.adoc b/tests/results_mode/standard_variables.adoc similarity index 100% rename from tests/mode_standard.adoc rename to tests/results_mode/standard_variables.adoc diff --git a/tests/result_tutorial/000/doc.json b/tests/results_tutorial/000/doc.json similarity index 100% rename from tests/result_tutorial/000/doc.json rename to tests/results_tutorial/000/doc.json diff --git a/tests/result_tutorial/000/doc.sh b/tests/results_tutorial/000/doc.sh similarity index 100% rename from tests/result_tutorial/000/doc.sh rename to tests/results_tutorial/000/doc.sh diff --git a/tests/result_tutorial/001/doc.json b/tests/results_tutorial/001/doc.json similarity index 100% rename from tests/result_tutorial/001/doc.json rename to tests/results_tutorial/001/doc.json diff --git a/tests/result_tutorial/001/doc.sh b/tests/results_tutorial/001/doc.sh similarity index 100% rename from tests/result_tutorial/001/doc.sh rename to tests/results_tutorial/001/doc.sh diff --git a/tests/result_tutorial/001/doc_changelog.sh b/tests/results_tutorial/001/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/001/doc_changelog.sh rename to tests/results_tutorial/001/doc_changelog.sh diff --git a/tests/result_tutorial/002/doc.json b/tests/results_tutorial/002/doc.json similarity index 100% rename from tests/result_tutorial/002/doc.json rename to tests/results_tutorial/002/doc.json diff --git a/tests/result_tutorial/002/doc.sh b/tests/results_tutorial/002/doc.sh similarity index 100% rename from tests/result_tutorial/002/doc.sh rename to tests/results_tutorial/002/doc.sh diff --git a/tests/result_tutorial/002/doc_changelog.sh b/tests/results_tutorial/002/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/002/doc_changelog.sh rename to tests/results_tutorial/002/doc_changelog.sh diff --git a/tests/result_tutorial/003/doc.json b/tests/results_tutorial/003/doc.json similarity index 100% rename from tests/result_tutorial/003/doc.json rename to tests/results_tutorial/003/doc.json diff --git a/tests/result_tutorial/003/doc.sh b/tests/results_tutorial/003/doc.sh similarity index 100% rename from tests/result_tutorial/003/doc.sh rename to tests/results_tutorial/003/doc.sh diff --git a/tests/result_tutorial/003/doc_changelog.sh b/tests/results_tutorial/003/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/003/doc_changelog.sh rename to tests/results_tutorial/003/doc_changelog.sh diff --git a/tests/result_tutorial/010/doc.json b/tests/results_tutorial/010/doc.json similarity index 100% rename from tests/result_tutorial/010/doc.json rename to tests/results_tutorial/010/doc.json diff --git a/tests/result_tutorial/010/doc.sh b/tests/results_tutorial/010/doc.sh similarity index 100% rename from tests/result_tutorial/010/doc.sh rename to tests/results_tutorial/010/doc.sh diff --git a/tests/result_tutorial/010/doc_changelog.sh b/tests/results_tutorial/010/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/010/doc_changelog.sh rename to tests/results_tutorial/010/doc_changelog.sh diff --git a/tests/result_tutorial/020/doc.json b/tests/results_tutorial/020/doc.json similarity index 100% rename from tests/result_tutorial/020/doc.json rename to tests/results_tutorial/020/doc.json diff --git a/tests/result_tutorial/020/doc.sh b/tests/results_tutorial/020/doc.sh similarity index 100% rename from tests/result_tutorial/020/doc.sh rename to tests/results_tutorial/020/doc.sh diff --git a/tests/result_tutorial/020/doc_changelog.sh b/tests/results_tutorial/020/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/020/doc_changelog.sh rename to tests/results_tutorial/020/doc_changelog.sh diff --git a/tests/result_tutorial/021/doc.json b/tests/results_tutorial/021/doc.json similarity index 100% rename from tests/result_tutorial/021/doc.json rename to tests/results_tutorial/021/doc.json diff --git a/tests/result_tutorial/021/doc.sh b/tests/results_tutorial/021/doc.sh similarity index 100% rename from tests/result_tutorial/021/doc.sh rename to tests/results_tutorial/021/doc.sh diff --git a/tests/result_tutorial/021/doc_changelog.sh b/tests/results_tutorial/021/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/021/doc_changelog.sh rename to tests/results_tutorial/021/doc_changelog.sh diff --git a/tests/result_tutorial/022/doc.json b/tests/results_tutorial/022/doc.json similarity index 100% rename from tests/result_tutorial/022/doc.json rename to tests/results_tutorial/022/doc.json diff --git a/tests/result_tutorial/022/doc.sh b/tests/results_tutorial/022/doc.sh similarity index 100% rename from tests/result_tutorial/022/doc.sh rename to tests/results_tutorial/022/doc.sh diff --git a/tests/result_tutorial/022/doc_changelog.sh b/tests/results_tutorial/022/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/022/doc_changelog.sh rename to tests/results_tutorial/022/doc_changelog.sh diff --git a/tests/result_tutorial/030/doc.json b/tests/results_tutorial/030/doc.json similarity index 100% rename from tests/result_tutorial/030/doc.json rename to tests/results_tutorial/030/doc.json diff --git a/tests/result_tutorial/030/doc.sh b/tests/results_tutorial/030/doc.sh similarity index 100% rename from tests/result_tutorial/030/doc.sh rename to tests/results_tutorial/030/doc.sh diff --git a/tests/result_tutorial/030/doc_changelog.sh b/tests/results_tutorial/030/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/030/doc_changelog.sh rename to tests/results_tutorial/030/doc_changelog.sh diff --git a/tests/result_tutorial/031/doc.json b/tests/results_tutorial/031/doc.json similarity index 100% rename from tests/result_tutorial/031/doc.json rename to tests/results_tutorial/031/doc.json diff --git a/tests/result_tutorial/031/doc.sh b/tests/results_tutorial/031/doc.sh similarity index 100% rename from tests/result_tutorial/031/doc.sh rename to tests/results_tutorial/031/doc.sh diff --git a/tests/result_tutorial/031/doc_changelog.sh b/tests/results_tutorial/031/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/031/doc_changelog.sh rename to tests/results_tutorial/031/doc_changelog.sh diff --git a/tests/result_tutorial/032/doc.json b/tests/results_tutorial/032/doc.json similarity index 100% rename from tests/result_tutorial/032/doc.json rename to tests/results_tutorial/032/doc.json diff --git a/tests/result_tutorial/032/doc.sh b/tests/results_tutorial/032/doc.sh similarity index 100% rename from tests/result_tutorial/032/doc.sh rename to tests/results_tutorial/032/doc.sh diff --git a/tests/result_tutorial/032/doc_changelog.sh b/tests/results_tutorial/032/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/032/doc_changelog.sh rename to tests/results_tutorial/032/doc_changelog.sh diff --git a/tests/result_tutorial/033/doc.json b/tests/results_tutorial/033/doc.json similarity index 100% rename from tests/result_tutorial/033/doc.json rename to tests/results_tutorial/033/doc.json diff --git a/tests/result_tutorial/033/doc.sh b/tests/results_tutorial/033/doc.sh similarity index 100% rename from tests/result_tutorial/033/doc.sh rename to tests/results_tutorial/033/doc.sh diff --git a/tests/result_tutorial/033/doc_changelog.sh b/tests/results_tutorial/033/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/033/doc_changelog.sh rename to tests/results_tutorial/033/doc_changelog.sh diff --git a/tests/result_tutorial/040/doc.json b/tests/results_tutorial/040/doc.json similarity index 100% rename from tests/result_tutorial/040/doc.json rename to tests/results_tutorial/040/doc.json diff --git a/tests/result_tutorial/040/doc.sh b/tests/results_tutorial/040/doc.sh similarity index 100% rename from tests/result_tutorial/040/doc.sh rename to tests/results_tutorial/040/doc.sh diff --git a/tests/result_tutorial/040/doc_changelog.sh b/tests/results_tutorial/040/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/040/doc_changelog.sh rename to tests/results_tutorial/040/doc_changelog.sh diff --git a/tests/result_tutorial/041/doc.json b/tests/results_tutorial/041/doc.json similarity index 100% rename from tests/result_tutorial/041/doc.json rename to tests/results_tutorial/041/doc.json diff --git a/tests/result_tutorial/041/doc.sh b/tests/results_tutorial/041/doc.sh similarity index 100% rename from tests/result_tutorial/041/doc.sh rename to tests/results_tutorial/041/doc.sh diff --git a/tests/result_tutorial/041/doc_changelog.sh b/tests/results_tutorial/041/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/041/doc_changelog.sh rename to tests/results_tutorial/041/doc_changelog.sh diff --git a/tests/result_tutorial/050/doc.json b/tests/results_tutorial/050/doc.json similarity index 100% rename from tests/result_tutorial/050/doc.json rename to tests/results_tutorial/050/doc.json diff --git a/tests/result_tutorial/050/doc.sh b/tests/results_tutorial/050/doc.sh similarity index 100% rename from tests/result_tutorial/050/doc.sh rename to tests/results_tutorial/050/doc.sh diff --git a/tests/result_tutorial/050/doc_changelog.sh b/tests/results_tutorial/050/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/050/doc_changelog.sh rename to tests/results_tutorial/050/doc_changelog.sh diff --git a/tests/result_tutorial/051/doc.json b/tests/results_tutorial/051/doc.json similarity index 100% rename from tests/result_tutorial/051/doc.json rename to tests/results_tutorial/051/doc.json diff --git a/tests/result_tutorial/051/doc.sh b/tests/results_tutorial/051/doc.sh similarity index 100% rename from tests/result_tutorial/051/doc.sh rename to tests/results_tutorial/051/doc.sh diff --git a/tests/result_tutorial/051/doc_changelog.sh b/tests/results_tutorial/051/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/051/doc_changelog.sh rename to tests/results_tutorial/051/doc_changelog.sh diff --git a/tests/result_tutorial/052/doc.json b/tests/results_tutorial/052/doc.json similarity index 100% rename from tests/result_tutorial/052/doc.json rename to tests/results_tutorial/052/doc.json diff --git a/tests/result_tutorial/052/doc.sh b/tests/results_tutorial/052/doc.sh similarity index 100% rename from tests/result_tutorial/052/doc.sh rename to tests/results_tutorial/052/doc.sh diff --git a/tests/result_tutorial/052/doc_changelog.sh b/tests/results_tutorial/052/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/052/doc_changelog.sh rename to tests/results_tutorial/052/doc_changelog.sh diff --git a/tests/result_tutorial/053/doc.json b/tests/results_tutorial/053/doc.json similarity index 100% rename from tests/result_tutorial/053/doc.json rename to tests/results_tutorial/053/doc.json diff --git a/tests/result_tutorial/053/doc.sh b/tests/results_tutorial/053/doc.sh similarity index 100% rename from tests/result_tutorial/053/doc.sh rename to tests/results_tutorial/053/doc.sh diff --git a/tests/result_tutorial/053/doc_changelog.sh b/tests/results_tutorial/053/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/053/doc_changelog.sh rename to tests/results_tutorial/053/doc_changelog.sh diff --git a/tests/result_tutorial/060/doc.json b/tests/results_tutorial/060/doc.json similarity index 100% rename from tests/result_tutorial/060/doc.json rename to tests/results_tutorial/060/doc.json diff --git a/tests/result_tutorial/060/doc.sh b/tests/results_tutorial/060/doc.sh similarity index 100% rename from tests/result_tutorial/060/doc.sh rename to tests/results_tutorial/060/doc.sh diff --git a/tests/result_tutorial/060/doc_changelog.sh b/tests/results_tutorial/060/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/060/doc_changelog.sh rename to tests/results_tutorial/060/doc_changelog.sh diff --git a/tests/result_tutorial/061/doc.json b/tests/results_tutorial/061/doc.json similarity index 100% rename from tests/result_tutorial/061/doc.json rename to tests/results_tutorial/061/doc.json diff --git a/tests/result_tutorial/061/doc.sh b/tests/results_tutorial/061/doc.sh similarity index 100% rename from tests/result_tutorial/061/doc.sh rename to tests/results_tutorial/061/doc.sh diff --git a/tests/result_tutorial/061/doc_changelog.sh b/tests/results_tutorial/061/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/061/doc_changelog.sh rename to tests/results_tutorial/061/doc_changelog.sh diff --git a/tests/result_tutorial/070/doc.json b/tests/results_tutorial/070/doc.json similarity index 100% rename from tests/result_tutorial/070/doc.json rename to tests/results_tutorial/070/doc.json diff --git a/tests/result_tutorial/070/doc.sh b/tests/results_tutorial/070/doc.sh similarity index 100% rename from tests/result_tutorial/070/doc.sh rename to tests/results_tutorial/070/doc.sh diff --git a/tests/result_tutorial/070/doc_changelog.sh b/tests/results_tutorial/070/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/070/doc_changelog.sh rename to tests/results_tutorial/070/doc_changelog.sh diff --git a/tests/result_tutorial/071/doc.json b/tests/results_tutorial/071/doc.json similarity index 100% rename from tests/result_tutorial/071/doc.json rename to tests/results_tutorial/071/doc.json diff --git a/tests/result_tutorial/071/doc.sh b/tests/results_tutorial/071/doc.sh similarity index 100% rename from tests/result_tutorial/071/doc.sh rename to tests/results_tutorial/071/doc.sh diff --git a/tests/result_tutorial/071/doc_changelog.sh b/tests/results_tutorial/071/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/071/doc_changelog.sh rename to tests/results_tutorial/071/doc_changelog.sh diff --git a/tests/result_tutorial/072/doc.json b/tests/results_tutorial/072/doc.json similarity index 100% rename from tests/result_tutorial/072/doc.json rename to tests/results_tutorial/072/doc.json diff --git a/tests/result_tutorial/072/doc.sh b/tests/results_tutorial/072/doc.sh similarity index 100% rename from tests/result_tutorial/072/doc.sh rename to tests/results_tutorial/072/doc.sh diff --git a/tests/result_tutorial/072/doc_changelog.sh b/tests/results_tutorial/072/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/072/doc_changelog.sh rename to tests/results_tutorial/072/doc_changelog.sh diff --git a/tests/result_tutorial/073/doc.json b/tests/results_tutorial/073/doc.json similarity index 100% rename from tests/result_tutorial/073/doc.json rename to tests/results_tutorial/073/doc.json diff --git a/tests/result_tutorial/073/doc.sh b/tests/results_tutorial/073/doc.sh similarity index 100% rename from tests/result_tutorial/073/doc.sh rename to tests/results_tutorial/073/doc.sh diff --git a/tests/result_tutorial/073/doc_changelog.sh b/tests/results_tutorial/073/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/073/doc_changelog.sh rename to tests/results_tutorial/073/doc_changelog.sh diff --git a/tests/result_tutorial/080/doc.json b/tests/results_tutorial/080/doc.json similarity index 100% rename from tests/result_tutorial/080/doc.json rename to tests/results_tutorial/080/doc.json diff --git a/tests/result_tutorial/080/doc.sh b/tests/results_tutorial/080/doc.sh similarity index 100% rename from tests/result_tutorial/080/doc.sh rename to tests/results_tutorial/080/doc.sh diff --git a/tests/result_tutorial/080/doc_changelog.sh b/tests/results_tutorial/080/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/080/doc_changelog.sh rename to tests/results_tutorial/080/doc_changelog.sh diff --git a/tests/result_tutorial/081/doc.json b/tests/results_tutorial/081/doc.json similarity index 100% rename from tests/result_tutorial/081/doc.json rename to tests/results_tutorial/081/doc.json diff --git a/tests/result_tutorial/081/doc.sh b/tests/results_tutorial/081/doc.sh similarity index 100% rename from tests/result_tutorial/081/doc.sh rename to tests/results_tutorial/081/doc.sh diff --git a/tests/result_tutorial/081/doc_changelog.sh b/tests/results_tutorial/081/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/081/doc_changelog.sh rename to tests/results_tutorial/081/doc_changelog.sh diff --git a/tests/result_tutorial/082/doc.json b/tests/results_tutorial/082/doc.json similarity index 100% rename from tests/result_tutorial/082/doc.json rename to tests/results_tutorial/082/doc.json diff --git a/tests/result_tutorial/082/doc.sh b/tests/results_tutorial/082/doc.sh similarity index 100% rename from tests/result_tutorial/082/doc.sh rename to tests/results_tutorial/082/doc.sh diff --git a/tests/result_tutorial/082/doc_changelog.sh b/tests/results_tutorial/082/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/082/doc_changelog.sh rename to tests/results_tutorial/082/doc_changelog.sh diff --git a/tests/result_tutorial/083/doc.json b/tests/results_tutorial/083/doc.json similarity index 100% rename from tests/result_tutorial/083/doc.json rename to tests/results_tutorial/083/doc.json diff --git a/tests/result_tutorial/083/doc.sh b/tests/results_tutorial/083/doc.sh similarity index 100% rename from tests/result_tutorial/083/doc.sh rename to tests/results_tutorial/083/doc.sh diff --git a/tests/result_tutorial/083/doc_changelog.sh b/tests/results_tutorial/083/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/083/doc_changelog.sh rename to tests/results_tutorial/083/doc_changelog.sh diff --git a/tests/result_tutorial/084/doc.json b/tests/results_tutorial/084/doc.json similarity index 100% rename from tests/result_tutorial/084/doc.json rename to tests/results_tutorial/084/doc.json diff --git a/tests/result_tutorial/084/doc.sh b/tests/results_tutorial/084/doc.sh similarity index 100% rename from tests/result_tutorial/084/doc.sh rename to tests/results_tutorial/084/doc.sh diff --git a/tests/result_tutorial/084/doc_changelog.sh b/tests/results_tutorial/084/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/084/doc_changelog.sh rename to tests/results_tutorial/084/doc_changelog.sh diff --git a/tests/result_tutorial/085/doc.json b/tests/results_tutorial/085/doc.json similarity index 100% rename from tests/result_tutorial/085/doc.json rename to tests/results_tutorial/085/doc.json diff --git a/tests/result_tutorial/085/doc.sh b/tests/results_tutorial/085/doc.sh similarity index 100% rename from tests/result_tutorial/085/doc.sh rename to tests/results_tutorial/085/doc.sh diff --git a/tests/result_tutorial/085/doc_changelog.sh b/tests/results_tutorial/085/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/085/doc_changelog.sh rename to tests/results_tutorial/085/doc_changelog.sh diff --git a/tests/result_tutorial/090/doc.json b/tests/results_tutorial/090/doc.json similarity index 100% rename from tests/result_tutorial/090/doc.json rename to tests/results_tutorial/090/doc.json diff --git a/tests/result_tutorial/090/doc.sh b/tests/results_tutorial/090/doc.sh similarity index 100% rename from tests/result_tutorial/090/doc.sh rename to tests/results_tutorial/090/doc.sh diff --git a/tests/result_tutorial/090/doc_changelog.sh b/tests/results_tutorial/090/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/090/doc_changelog.sh rename to tests/results_tutorial/090/doc_changelog.sh diff --git a/tests/result_tutorial/091/doc.json b/tests/results_tutorial/091/doc.json similarity index 100% rename from tests/result_tutorial/091/doc.json rename to tests/results_tutorial/091/doc.json diff --git a/tests/result_tutorial/091/doc.sh b/tests/results_tutorial/091/doc.sh similarity index 100% rename from tests/result_tutorial/091/doc.sh rename to tests/results_tutorial/091/doc.sh diff --git a/tests/result_tutorial/091/doc_changelog.sh b/tests/results_tutorial/091/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/091/doc_changelog.sh rename to tests/results_tutorial/091/doc_changelog.sh diff --git a/tests/result_tutorial/100/doc.json b/tests/results_tutorial/100/doc.json similarity index 100% rename from tests/result_tutorial/100/doc.json rename to tests/results_tutorial/100/doc.json diff --git a/tests/result_tutorial/100/doc.sh b/tests/results_tutorial/100/doc.sh similarity index 100% rename from tests/result_tutorial/100/doc.sh rename to tests/results_tutorial/100/doc.sh diff --git a/tests/result_tutorial/100/doc_changelog.sh b/tests/results_tutorial/100/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/100/doc_changelog.sh rename to tests/results_tutorial/100/doc_changelog.sh diff --git a/tests/result_tutorial/110/doc.json b/tests/results_tutorial/110/doc.json similarity index 100% rename from tests/result_tutorial/110/doc.json rename to tests/results_tutorial/110/doc.json diff --git a/tests/result_tutorial/110/doc.sh b/tests/results_tutorial/110/doc.sh similarity index 100% rename from tests/result_tutorial/110/doc.sh rename to tests/results_tutorial/110/doc.sh diff --git a/tests/result_tutorial/110/doc_changelog.sh b/tests/results_tutorial/110/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/110/doc_changelog.sh rename to tests/results_tutorial/110/doc_changelog.sh diff --git a/tests/result_tutorial/111/doc.json b/tests/results_tutorial/111/doc.json similarity index 100% rename from tests/result_tutorial/111/doc.json rename to tests/results_tutorial/111/doc.json diff --git a/tests/result_tutorial/111/doc.sh b/tests/results_tutorial/111/doc.sh similarity index 100% rename from tests/result_tutorial/111/doc.sh rename to tests/results_tutorial/111/doc.sh diff --git a/tests/result_tutorial/111/doc_changelog.sh b/tests/results_tutorial/111/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/111/doc_changelog.sh rename to tests/results_tutorial/111/doc_changelog.sh diff --git a/tests/result_tutorial/120/doc.json b/tests/results_tutorial/120/doc.json similarity index 100% rename from tests/result_tutorial/120/doc.json rename to tests/results_tutorial/120/doc.json diff --git a/tests/result_tutorial/120/doc.sh b/tests/results_tutorial/120/doc.sh similarity index 100% rename from tests/result_tutorial/120/doc.sh rename to tests/results_tutorial/120/doc.sh diff --git a/tests/result_tutorial/120/doc_changelog.sh b/tests/results_tutorial/120/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/120/doc_changelog.sh rename to tests/results_tutorial/120/doc_changelog.sh diff --git a/tests/result_tutorial/121/doc.json b/tests/results_tutorial/121/doc.json similarity index 100% rename from tests/result_tutorial/121/doc.json rename to tests/results_tutorial/121/doc.json diff --git a/tests/result_tutorial/121/doc.sh b/tests/results_tutorial/121/doc.sh similarity index 100% rename from tests/result_tutorial/121/doc.sh rename to tests/results_tutorial/121/doc.sh diff --git a/tests/result_tutorial/121/doc_changelog.sh b/tests/results_tutorial/121/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/121/doc_changelog.sh rename to tests/results_tutorial/121/doc_changelog.sh diff --git a/tests/result_tutorial/130/doc.json b/tests/results_tutorial/130/doc.json similarity index 100% rename from tests/result_tutorial/130/doc.json rename to tests/results_tutorial/130/doc.json diff --git a/tests/result_tutorial/130/doc.sh b/tests/results_tutorial/130/doc.sh similarity index 100% rename from tests/result_tutorial/130/doc.sh rename to tests/results_tutorial/130/doc.sh diff --git a/tests/result_tutorial/130/doc_changelog.sh b/tests/results_tutorial/130/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/130/doc_changelog.sh rename to tests/results_tutorial/130/doc_changelog.sh diff --git a/tests/result_tutorial/131/doc.json b/tests/results_tutorial/131/doc.json similarity index 100% rename from tests/result_tutorial/131/doc.json rename to tests/results_tutorial/131/doc.json diff --git a/tests/result_tutorial/131/doc.sh b/tests/results_tutorial/131/doc.sh similarity index 100% rename from tests/result_tutorial/131/doc.sh rename to tests/results_tutorial/131/doc.sh diff --git a/tests/result_tutorial/131/doc_changelog.sh b/tests/results_tutorial/131/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/131/doc_changelog.sh rename to tests/results_tutorial/131/doc_changelog.sh diff --git a/tests/result_tutorial/132/doc.json b/tests/results_tutorial/132/doc.json similarity index 100% rename from tests/result_tutorial/132/doc.json rename to tests/results_tutorial/132/doc.json diff --git a/tests/result_tutorial/132/doc.sh b/tests/results_tutorial/132/doc.sh similarity index 100% rename from tests/result_tutorial/132/doc.sh rename to tests/results_tutorial/132/doc.sh diff --git a/tests/result_tutorial/132/doc_changelog.sh b/tests/results_tutorial/132/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/132/doc_changelog.sh rename to tests/results_tutorial/132/doc_changelog.sh diff --git a/tests/result_tutorial/140/doc.json b/tests/results_tutorial/140/doc.json similarity index 100% rename from tests/result_tutorial/140/doc.json rename to tests/results_tutorial/140/doc.json diff --git a/tests/result_tutorial/140/doc.sh b/tests/results_tutorial/140/doc.sh similarity index 100% rename from tests/result_tutorial/140/doc.sh rename to tests/results_tutorial/140/doc.sh diff --git a/tests/result_tutorial/140/doc_changelog.sh b/tests/results_tutorial/140/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/140/doc_changelog.sh rename to tests/results_tutorial/140/doc_changelog.sh diff --git a/tests/result_tutorial/150/doc.json b/tests/results_tutorial/150/doc.json similarity index 100% rename from tests/result_tutorial/150/doc.json rename to tests/results_tutorial/150/doc.json diff --git a/tests/result_tutorial/150/doc.sh b/tests/results_tutorial/150/doc.sh similarity index 100% rename from tests/result_tutorial/150/doc.sh rename to tests/results_tutorial/150/doc.sh diff --git a/tests/result_tutorial/150/doc_changelog.sh b/tests/results_tutorial/150/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/150/doc_changelog.sh rename to tests/results_tutorial/150/doc_changelog.sh diff --git a/tests/result_tutorial/160/doc.json b/tests/results_tutorial/160/doc.json similarity index 100% rename from tests/result_tutorial/160/doc.json rename to tests/results_tutorial/160/doc.json diff --git a/tests/result_tutorial/160/doc.sh b/tests/results_tutorial/160/doc.sh similarity index 100% rename from tests/result_tutorial/160/doc.sh rename to tests/results_tutorial/160/doc.sh diff --git a/tests/result_tutorial/160/doc_changelog.sh b/tests/results_tutorial/160/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/160/doc_changelog.sh rename to tests/results_tutorial/160/doc_changelog.sh diff --git a/tests/result_tutorial/161/doc.json b/tests/results_tutorial/161/doc.json similarity index 100% rename from tests/result_tutorial/161/doc.json rename to tests/results_tutorial/161/doc.json diff --git a/tests/result_tutorial/161/doc.sh b/tests/results_tutorial/161/doc.sh similarity index 100% rename from tests/result_tutorial/161/doc.sh rename to tests/results_tutorial/161/doc.sh diff --git a/tests/result_tutorial/161/doc_changelog.sh b/tests/results_tutorial/161/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/161/doc_changelog.sh rename to tests/results_tutorial/161/doc_changelog.sh diff --git a/tests/result_tutorial/162/doc.json b/tests/results_tutorial/162/doc.json similarity index 100% rename from tests/result_tutorial/162/doc.json rename to tests/results_tutorial/162/doc.json diff --git a/tests/result_tutorial/162/doc.sh b/tests/results_tutorial/162/doc.sh similarity index 100% rename from tests/result_tutorial/162/doc.sh rename to tests/results_tutorial/162/doc.sh diff --git a/tests/result_tutorial/162/doc_changelog.sh b/tests/results_tutorial/162/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/162/doc_changelog.sh rename to tests/results_tutorial/162/doc_changelog.sh diff --git a/tests/result_tutorial/170/doc.json b/tests/results_tutorial/170/doc.json similarity index 100% rename from tests/result_tutorial/170/doc.json rename to tests/results_tutorial/170/doc.json diff --git a/tests/result_tutorial/170/doc.sh b/tests/results_tutorial/170/doc.sh similarity index 100% rename from tests/result_tutorial/170/doc.sh rename to tests/results_tutorial/170/doc.sh diff --git a/tests/result_tutorial/170/doc_changelog.sh b/tests/results_tutorial/170/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/170/doc_changelog.sh rename to tests/results_tutorial/170/doc_changelog.sh diff --git a/tests/result_tutorial/180/doc.json b/tests/results_tutorial/180/doc.json similarity index 100% rename from tests/result_tutorial/180/doc.json rename to tests/results_tutorial/180/doc.json diff --git a/tests/result_tutorial/180/doc.sh b/tests/results_tutorial/180/doc.sh similarity index 100% rename from tests/result_tutorial/180/doc.sh rename to tests/results_tutorial/180/doc.sh diff --git a/tests/result_tutorial/180/doc_changelog.sh b/tests/results_tutorial/180/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/180/doc_changelog.sh rename to tests/results_tutorial/180/doc_changelog.sh diff --git a/tests/result_tutorial/181/doc.json b/tests/results_tutorial/181/doc.json similarity index 100% rename from tests/result_tutorial/181/doc.json rename to tests/results_tutorial/181/doc.json diff --git a/tests/result_tutorial/181/doc.sh b/tests/results_tutorial/181/doc.sh similarity index 100% rename from tests/result_tutorial/181/doc.sh rename to tests/results_tutorial/181/doc.sh diff --git a/tests/result_tutorial/181/doc_changelog.sh b/tests/results_tutorial/181/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/181/doc_changelog.sh rename to tests/results_tutorial/181/doc_changelog.sh diff --git a/tests/result_tutorial/190/doc.json b/tests/results_tutorial/190/doc.json similarity index 100% rename from tests/result_tutorial/190/doc.json rename to tests/results_tutorial/190/doc.json diff --git a/tests/result_tutorial/190/doc.sh b/tests/results_tutorial/190/doc.sh similarity index 100% rename from tests/result_tutorial/190/doc.sh rename to tests/results_tutorial/190/doc.sh diff --git a/tests/result_tutorial/190/doc_changelog.sh b/tests/results_tutorial/190/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/190/doc_changelog.sh rename to tests/results_tutorial/190/doc_changelog.sh diff --git a/tests/result_tutorial/200/doc.json b/tests/results_tutorial/200/doc.json similarity index 100% rename from tests/result_tutorial/200/doc.json rename to tests/results_tutorial/200/doc.json diff --git a/tests/result_tutorial/200/doc.sh b/tests/results_tutorial/200/doc.sh similarity index 100% rename from tests/result_tutorial/200/doc.sh rename to tests/results_tutorial/200/doc.sh diff --git a/tests/result_tutorial/200/doc_changelog.sh b/tests/results_tutorial/200/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/200/doc_changelog.sh rename to tests/results_tutorial/200/doc_changelog.sh diff --git a/tests/result_tutorial/201/doc.json b/tests/results_tutorial/201/doc.json similarity index 100% rename from tests/result_tutorial/201/doc.json rename to tests/results_tutorial/201/doc.json diff --git a/tests/result_tutorial/201/doc.sh b/tests/results_tutorial/201/doc.sh similarity index 100% rename from tests/result_tutorial/201/doc.sh rename to tests/results_tutorial/201/doc.sh diff --git a/tests/result_tutorial/201/doc_changelog.sh b/tests/results_tutorial/201/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/201/doc_changelog.sh rename to tests/results_tutorial/201/doc_changelog.sh diff --git a/tests/result_tutorial/202/doc.json b/tests/results_tutorial/202/doc.json similarity index 100% rename from tests/result_tutorial/202/doc.json rename to tests/results_tutorial/202/doc.json diff --git a/tests/result_tutorial/202/doc.sh b/tests/results_tutorial/202/doc.sh similarity index 100% rename from tests/result_tutorial/202/doc.sh rename to tests/results_tutorial/202/doc.sh diff --git a/tests/result_tutorial/202/doc_changelog.sh b/tests/results_tutorial/202/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/202/doc_changelog.sh rename to tests/results_tutorial/202/doc_changelog.sh diff --git a/tests/result_tutorial/210/doc.json b/tests/results_tutorial/210/doc.json similarity index 100% rename from tests/result_tutorial/210/doc.json rename to tests/results_tutorial/210/doc.json diff --git a/tests/result_tutorial/210/doc.sh b/tests/results_tutorial/210/doc.sh similarity index 100% rename from tests/result_tutorial/210/doc.sh rename to tests/results_tutorial/210/doc.sh diff --git a/tests/result_tutorial/210/doc_changelog.sh b/tests/results_tutorial/210/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/210/doc_changelog.sh rename to tests/results_tutorial/210/doc_changelog.sh diff --git a/tests/result_tutorial/220/doc.json b/tests/results_tutorial/220/doc.json similarity index 100% rename from tests/result_tutorial/220/doc.json rename to tests/results_tutorial/220/doc.json diff --git a/tests/result_tutorial/220/doc.sh b/tests/results_tutorial/220/doc.sh similarity index 100% rename from tests/result_tutorial/220/doc.sh rename to tests/results_tutorial/220/doc.sh diff --git a/tests/result_tutorial/220/doc_changelog.sh b/tests/results_tutorial/220/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/220/doc_changelog.sh rename to tests/results_tutorial/220/doc_changelog.sh diff --git a/tests/result_tutorial/230/doc.json b/tests/results_tutorial/230/doc.json similarity index 100% rename from tests/result_tutorial/230/doc.json rename to tests/results_tutorial/230/doc.json diff --git a/tests/result_tutorial/230/doc.sh b/tests/results_tutorial/230/doc.sh similarity index 100% rename from tests/result_tutorial/230/doc.sh rename to tests/results_tutorial/230/doc.sh diff --git a/tests/result_tutorial/230/doc_changelog.sh b/tests/results_tutorial/230/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/230/doc_changelog.sh rename to tests/results_tutorial/230/doc_changelog.sh diff --git a/tests/result_tutorial/231/doc.json b/tests/results_tutorial/231/doc.json similarity index 100% rename from tests/result_tutorial/231/doc.json rename to tests/results_tutorial/231/doc.json diff --git a/tests/result_tutorial/231/doc.sh b/tests/results_tutorial/231/doc.sh similarity index 100% rename from tests/result_tutorial/231/doc.sh rename to tests/results_tutorial/231/doc.sh diff --git a/tests/result_tutorial/231/doc_changelog.sh b/tests/results_tutorial/231/doc_changelog.sh similarity index 100% rename from tests/result_tutorial/231/doc_changelog.sh rename to tests/results_tutorial/231/doc_changelog.sh diff --git a/tests/test_mode.py b/tests/test_mode.py index 54ad5fb6a..0a624bb10 100644 --- a/tests/test_mode.py +++ b/tests/test_mode.py @@ -19,6 +19,8 @@ def change_mode(subconfig, modes): subconfig.property.setdefault( frozenset(subconfig.property.default("read_only", "append") | read_only), "read_only", "append" ) + for p in read_only: + subconfig.permissive.add(p) subconfig.property.read_write() @@ -28,22 +30,23 @@ def _test(modes): rougailconfig['step.output'] = 'doc' # rougailconfig['tiramisu_cache'] = 'p.py' dirs = [str(test_dir / 'mode')] - rougailconfig['modes_level'] = ['basic', 'standard', 'advanced'] + rougailconfig['modes_level'] = ['basic', 'standard', 'advanced', 'bitwarden'] rougailconfig['main_structural_directories'] = dirs rougailconfig['doc.output_format'] = 'asciidoc' -# rougailconfig['doc.disabled_modes'] = modes - rougail = Rougail(rougailconfig) - config = rougail.run() - change_mode(config, modes) - inventory = RougailOutputDoc(config, rougailconfig=rougailconfig) - doc = inventory.run()[1] - result_file = test_dir / f'mode_{"_".join(modes)}.adoc' - if not result_file.is_file(): - with open(str(result_file), 'w') as docfh: - docfh.write(doc) - with open(str(result_file)) as docfh: - result = docfh.read() - assert doc == result, result_file + for content in ["variables", "example"]: + rougailconfig["doc.contents"] = [content] + rougail = Rougail(rougailconfig) + config = rougail.run() + change_mode(config, modes) + inventory = RougailOutputDoc(config, rougailconfig=rougailconfig) + doc = inventory.run()[1] + result_file = test_dir / "results_mode" / f'{"_".join(modes)}_{content}.adoc' + if not result_file.is_file(): + with open(str(result_file), 'w') as docfh: + docfh.write(doc) + with open(str(result_file)) as docfh: + result = docfh.read() + assert doc == result, result_file def test_mode_advanced(): diff --git a/tests/test_tutorial.py b/tests/test_tutorial.py index 4d47dc296..378ba0ed0 100644 --- a/tests/test_tutorial.py +++ b/tests/test_tutorial.py @@ -11,7 +11,7 @@ os.environ['COLUMNS'] = '80' TUTORIAL_ROUGAIL = "../rougail-tutorials_builder/examples/" TMP = Path("tutorial_tmp") -RESULT = Path("tests") / "result_tutorial" +RESULT = Path("tests") / "results_tutorial" def test_tutorial(): tmp_structural_files = TMP / "structural"