From 6ecfb634d23f330fe8806b5c3f8b0b39e3f11313 Mon Sep 17 00:00:00 2001
From: Pete Davison <pd93.uk@outlook.com>
Date: Wed, 6 Sep 2023 00:18:30 +0000
Subject: [PATCH] fix: includes interpolation test

---
 task_test.go                                           |  6 +++---
 testdata/includes_interpolation/Taskfile.yml           | 10 ----------
 testdata/includes_interpolation/include/Taskfile.yml   |  7 +++++++
 .../include_with_dir/Taskfile.yml                      |  9 +++++++++
 4 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 testdata/includes_interpolation/Taskfile.yml
 create mode 100644 testdata/includes_interpolation/include/Taskfile.yml
 create mode 100644 testdata/includes_interpolation/include_with_dir/Taskfile.yml

diff --git a/task_test.go b/task_test.go
index 99b16502..fe6e7ec7 100644
--- a/task_test.go
+++ b/task_test.go
@@ -1199,15 +1199,15 @@ func TestIncludesInterpolation(t *testing.T) {
 		expectedErr    bool
 		expectedOutput string
 	}{
-		{"include", "include", false, "includes_interpolation\n"},
-		{"include with dir", "include-with-dir", false, "included\n"},
+		{"include", "include", false, "include\n"},
+		{"include_with_dir", "include-with-dir", false, "included\n"},
 	}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			var buff bytes.Buffer
 			e := task.Executor{
-				Dir:    dir,
+				Dir:    filepath.Join(dir, test.name),
 				Stdout: &buff,
 				Stderr: &buff,
 				Silent: true,
diff --git a/testdata/includes_interpolation/Taskfile.yml b/testdata/includes_interpolation/Taskfile.yml
deleted file mode 100644
index 3c4bfe9d..00000000
--- a/testdata/includes_interpolation/Taskfile.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: "3"
-
-vars:
-  MODULE_NAME: included
-
-includes:
-  include: './{{.MODULE_NAME}}/Taskfile.yml'
-  include-with-dir:
-    taskfile: './{{.MODULE_NAME}}/Taskfile.yml'
-    dir: '{{.MODULE_NAME}}'
diff --git a/testdata/includes_interpolation/include/Taskfile.yml b/testdata/includes_interpolation/include/Taskfile.yml
new file mode 100644
index 00000000..497f4ed4
--- /dev/null
+++ b/testdata/includes_interpolation/include/Taskfile.yml
@@ -0,0 +1,7 @@
+version: "3"
+
+vars:
+  MODULE_NAME: included
+
+includes:
+  include: '../{{.MODULE_NAME}}/Taskfile.yml'
diff --git a/testdata/includes_interpolation/include_with_dir/Taskfile.yml b/testdata/includes_interpolation/include_with_dir/Taskfile.yml
new file mode 100644
index 00000000..9006e78e
--- /dev/null
+++ b/testdata/includes_interpolation/include_with_dir/Taskfile.yml
@@ -0,0 +1,9 @@
+version: "3"
+
+vars:
+  MODULE_NAME: included
+
+includes:
+  include-with-dir:
+    taskfile: '../{{.MODULE_NAME}}/Taskfile.yml'
+    dir: '../{{.MODULE_NAME}}'