Skip to content

Commit 6a3da1a

Browse files
committed
fix: Node.FilenameAndLastDir return order in git node implementation
1 parent 5ab5877 commit 6a3da1a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: taskfile/node_git.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,5 @@ func (node *GitNode) ResolveDir(dir string) (string, error) {
121121
}
122122

123123
func (node *GitNode) FilenameAndLastDir() (string, string) {
124-
return filepath.Base(node.path), filepath.Base(filepath.Dir(node.path))
124+
return filepath.Base(filepath.Dir(node.filepath)), filepath.Base(node.filepath)
125125
}

Diff for: taskfile/node_git_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@ func TestGitNode_FilenameAndDir(t *testing.T) {
6767

6868
node, err := NewGitNode("https://github.com/foo/bar.git//directory/Taskfile.yml?ref=main", "", false)
6969
assert.NoError(t, err)
70-
filename, dir := node.FilenameAndLastDir()
70+
dir, filename := node.FilenameAndLastDir()
7171
assert.Equal(t, "Taskfile.yml", filename)
7272
assert.Equal(t, "directory", dir)
7373

7474
node, err = NewGitNode("https://github.com/foo/bar.git//Taskfile.yml?ref=main", "", false)
7575
assert.NoError(t, err)
76-
filename, dir = node.FilenameAndLastDir()
76+
dir, filename = node.FilenameAndLastDir()
7777
assert.Equal(t, "Taskfile.yml", filename)
7878
assert.Equal(t, ".", dir)
7979

8080
node, err = NewGitNode("https://github.com/foo/bar.git//multiple/directory/Taskfile.yml?ref=main", "", false)
8181
assert.NoError(t, err)
82-
filename, dir = node.FilenameAndLastDir()
82+
dir, filename = node.FilenameAndLastDir()
8383
assert.Equal(t, "Taskfile.yml", filename)
8484
assert.Equal(t, "directory", dir)
8585
}

0 commit comments

Comments
 (0)