From d567e23e5046246b9226b06071d76e7b3c65375b Mon Sep 17 00:00:00 2001
From: Evgeny Abramovich <evg.abramovitch@gmail.com>
Date: Wed, 29 Jan 2020 11:25:11 +0300
Subject: [PATCH] Added tests for new inport taskfile logic

---
 task_test.go                                   | 10 +++++++---
 testdata/includes/Taskfile.yml                 | 18 ++++++++++++++++++
 testdata/includes/module1/Taskfile.yml         |  9 +++++++++
 testdata/includes/module2/Taskfile.yml         |  9 +++++++++
 testdata/includes/module3/CustomTaskfile.yml   |  6 ++++++
 .../includes/module3/CustomTaskfile_darwin.yml |  6 ++++++
 .../includes/module3/CustomTaskfile_linux.yml  |  6 ++++++
 .../module3/CustomTaskfile_windows.yml         |  6 ++++++
 8 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 testdata/includes/module1/Taskfile.yml
 create mode 100644 testdata/includes/module2/Taskfile.yml
 create mode 100644 testdata/includes/module3/CustomTaskfile.yml
 create mode 100644 testdata/includes/module3/CustomTaskfile_darwin.yml
 create mode 100644 testdata/includes/module3/CustomTaskfile_linux.yml
 create mode 100644 testdata/includes/module3/CustomTaskfile_windows.yml

diff --git a/task_test.go b/task_test.go
index 5877088d..ce31ff1b 100644
--- a/task_test.go
+++ b/task_test.go
@@ -540,9 +540,13 @@ func TestIncludes(t *testing.T) {
 		Target:    "default",
 		TrimSpace: true,
 		Files: map[string]string{
-			"main.txt":               "main",
-			"included_directory.txt": "included_directory",
-			"included_taskfile.txt":  "included_taskfile",
+			"main.txt":                                  "main",
+			"included_directory.txt":                    "included_directory",
+			"included_directory_without_dir.txt":        "included_directory_without_dir",
+			"included_taskfile_without_dir.txt":         "included_taskfile_without_dir",
+			"./module2/included_directory_with_dir.txt": "included_directory_with_dir",
+			"./module2/included_taskfile_with_dir.txt":  "included_taskfile_with_dir",
+			"./module3/os_related.txt":                  runtime.GOOS,
 		},
 	}
 	tt.Run(t)
diff --git a/testdata/includes/Taskfile.yml b/testdata/includes/Taskfile.yml
index 6b7f29ef..144116fb 100644
--- a/testdata/includes/Taskfile.yml
+++ b/testdata/includes/Taskfile.yml
@@ -3,6 +3,19 @@ version: '2'
 includes:
   included: ./included
   included_taskfile: ./Taskfile2.yml
+  included_without_dir:
+    taskfile:  ./module1
+  included_taskfile_without_dir:
+    taskfile:  ./module1/Taskfile.yml
+  included_with_dir:
+    taskfile:  ./module2
+    dir:  ./module2
+  included_taskfile_with_dir:
+    taskfile:  ./module2/Taskfile.yml
+    dir:  ./module2
+  os_related:
+    taskfile:  ./module3/CustomTaskfile.yml
+    dir:  ./module3
 
 tasks:
   default:
@@ -10,6 +23,11 @@ tasks:
       - task: gen
       - task: included:gen
       - task: included_taskfile:gen
+      - task: included_without_dir:gen_file
+      - task: included_taskfile_without_dir:gen_dir
+      - task: included_with_dir:gen_file
+      - task: included_taskfile_with_dir:gen_dir
+      - task: os_related:gen
 
   gen:
     cmds:
diff --git a/testdata/includes/module1/Taskfile.yml b/testdata/includes/module1/Taskfile.yml
new file mode 100644
index 00000000..e5d5126b
--- /dev/null
+++ b/testdata/includes/module1/Taskfile.yml
@@ -0,0 +1,9 @@
+version: '2'
+
+tasks:
+  gen_dir:
+    cmds:
+      - echo included_directory_without_dir > included_directory_without_dir.txt
+  gen_file:
+    cmds:
+      - echo included_taskfile_without_dir > included_taskfile_without_dir.txt
diff --git a/testdata/includes/module2/Taskfile.yml b/testdata/includes/module2/Taskfile.yml
new file mode 100644
index 00000000..e746d559
--- /dev/null
+++ b/testdata/includes/module2/Taskfile.yml
@@ -0,0 +1,9 @@
+version: '2'
+
+tasks:
+  gen_dir:
+    cmds:
+      - echo included_directory_with_dir > included_directory_with_dir.txt
+  gen_file:
+    cmds:
+      - echo included_taskfile_with_dir > included_taskfile_with_dir.txt
diff --git a/testdata/includes/module3/CustomTaskfile.yml b/testdata/includes/module3/CustomTaskfile.yml
new file mode 100644
index 00000000..a9a954a5
--- /dev/null
+++ b/testdata/includes/module3/CustomTaskfile.yml
@@ -0,0 +1,6 @@
+version: '2'
+
+tasks:
+  gen:
+    cmds:
+      - echo "INVALID" > os_related.txt
diff --git a/testdata/includes/module3/CustomTaskfile_darwin.yml b/testdata/includes/module3/CustomTaskfile_darwin.yml
new file mode 100644
index 00000000..5b9ed323
--- /dev/null
+++ b/testdata/includes/module3/CustomTaskfile_darwin.yml
@@ -0,0 +1,6 @@
+version: '2'
+
+tasks:
+  gen:
+    cmds:
+      - echo "darwin" > os_related.txt
diff --git a/testdata/includes/module3/CustomTaskfile_linux.yml b/testdata/includes/module3/CustomTaskfile_linux.yml
new file mode 100644
index 00000000..2fc40546
--- /dev/null
+++ b/testdata/includes/module3/CustomTaskfile_linux.yml
@@ -0,0 +1,6 @@
+version: '2'
+
+tasks:
+  gen:
+    cmds:
+      - echo "linux" > os_related.txt
diff --git a/testdata/includes/module3/CustomTaskfile_windows.yml b/testdata/includes/module3/CustomTaskfile_windows.yml
new file mode 100644
index 00000000..5307e81f
--- /dev/null
+++ b/testdata/includes/module3/CustomTaskfile_windows.yml
@@ -0,0 +1,6 @@
+version: '2'
+
+tasks:
+  gen:
+    cmds:
+      - echo "windows" > os_related.txt