Merge pull request #3 from dafyddj/fix/answers-file

fix: make the generated test suite handle the templated answer file
dafyddj · Jan 11, 2024 · 6b4d2f6 · 6b4d2f6
2 parents d63669d + 67ee0d0
commit 6b4d2f6
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 4 deletions.
diff --git a/base b/base
diff --git a/copier.yaml b/copier.yaml
@@ -1,2 +1,2 @@
 _subdirectory: template
-_templates_suffix: .copier-jinja
+_templates_suffix: .bootstrap-jinja
diff --git a/... _copier_conf.answers_file {{'}}'}}.jinja → ...r_conf.answers_file {{'}}'}}.copier-jinja b/... _copier_conf.answers_file {{'}}'}}.jinja → ...r_conf.answers_file {{'}}'}}.copier-jinja
diff --git a/template/test/GenerateProject/catalogue.tt b/template/test/GenerateProject/catalogue.tt
@@ -1,3 +1,3 @@
 The following new files/directories were created:
 <Test Directory>
-----.gitkeep
+----.copier-answers.yml
diff --git a/..._copier_conf.answers_file }}.copier-jinja → ...pier_conf.answers_file }}.bootstrap-jinja b/..._copier_conf.answers_file }}.copier-jinja → ...pier_conf.answers_file }}.bootstrap-jinja
diff --git a/test/GenerateProject/catalogue.tt b/test/GenerateProject/catalogue.tt
@@ -9,7 +9,7 @@ The following new files/directories were created:
 --------copier
 ----copier.yaml
 ----template
---------{{ _copier_conf.answers_file }}.jinja
+--------{{ _copier_conf.answers_file }}.copier-jinja
 ----test
 --------config.tt
 --------options.tt

diff --git a/test/GenerateProject/catalogue_tt.tt b/test/GenerateProject/catalogue_tt.tt
@@ -0,0 +1 @@
+../../base/test/GenerateProject/catalogue.tt
diff --git a/test/config.tt b/test/config.tt
@@ -11,6 +11,7 @@ create_catalogues:true
 discard_file:stderr
 
 [collate_file]
+catalogue_tt:test/GenerateProject/catalogue.tt
 config_tt:test/config.tt
 copier_yaml:copier.yaml
 main_yml:.github/workflows/main.yml
+0 −0		template/.gitkeep
+2 −0		template/{{ _copier_conf.answers_file }}.copier-jinja
+1 −1		test/GenerateProject/catalogue.tt