From 6854b4c3004c6a4007254e93a5fb3fc1c2654d5b Mon Sep 17 00:00:00 2001
From: Pete Davison <pd93.uk@outlook.com>
Date: Fri, 15 Sep 2023 15:02:18 +0000
Subject: [PATCH] fix: include_with_vars test included the same file multiple
 times

---
 testdata/include_with_vars/Taskfile.yml               |  6 +++---
 .../{Taskfile.include.yml => Taskfile.include1.yml}   |  0
 .../include_with_vars/include/Taskfile.include2.yml   | 11 +++++++++++
 .../include_with_vars/include/Taskfile.include3.yml   | 11 +++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)
 rename testdata/include_with_vars/include/{Taskfile.include.yml => Taskfile.include1.yml} (100%)
 create mode 100644 testdata/include_with_vars/include/Taskfile.include2.yml
 create mode 100644 testdata/include_with_vars/include/Taskfile.include3.yml

diff --git a/testdata/include_with_vars/Taskfile.yml b/testdata/include_with_vars/Taskfile.yml
index aee8f515..5ded3e33 100644
--- a/testdata/include_with_vars/Taskfile.yml
+++ b/testdata/include_with_vars/Taskfile.yml
@@ -2,15 +2,15 @@ version: "3"
 
 includes:
   included1:
-    taskfile: include/Taskfile.include.yml
+    taskfile: include/Taskfile.include1.yml
     vars:
       VAR_1: included1-var1
   included2:
-    taskfile: include/Taskfile.include.yml
+    taskfile: include/Taskfile.include2.yml
     vars:
       VAR_1: included2-var1
   included3:
-    taskfile: include/Taskfile.include.yml
+    taskfile: include/Taskfile.include3.yml
 
 tasks:
   task1:
diff --git a/testdata/include_with_vars/include/Taskfile.include.yml b/testdata/include_with_vars/include/Taskfile.include1.yml
similarity index 100%
rename from testdata/include_with_vars/include/Taskfile.include.yml
rename to testdata/include_with_vars/include/Taskfile.include1.yml
diff --git a/testdata/include_with_vars/include/Taskfile.include2.yml b/testdata/include_with_vars/include/Taskfile.include2.yml
new file mode 100644
index 00000000..3bb7a68e
--- /dev/null
+++ b/testdata/include_with_vars/include/Taskfile.include2.yml
@@ -0,0 +1,11 @@
+version: "3"
+
+vars:
+  VAR_1: '{{.VAR_1 | default "included-default-var1"}}'
+  VAR_2: '{{.VAR_2 | default "included-default-var2"}}'
+
+tasks:
+  task1:
+    cmds:
+      - echo "VAR_1 is {{.VAR_1}}"
+      - echo "VAR_2 is {{.VAR_2}}"
diff --git a/testdata/include_with_vars/include/Taskfile.include3.yml b/testdata/include_with_vars/include/Taskfile.include3.yml
new file mode 100644
index 00000000..3bb7a68e
--- /dev/null
+++ b/testdata/include_with_vars/include/Taskfile.include3.yml
@@ -0,0 +1,11 @@
+version: "3"
+
+vars:
+  VAR_1: '{{.VAR_1 | default "included-default-var1"}}'
+  VAR_2: '{{.VAR_2 | default "included-default-var2"}}'
+
+tasks:
+  task1:
+    cmds:
+      - echo "VAR_1 is {{.VAR_1}}"
+      - echo "VAR_2 is {{.VAR_2}}"