fix test

taskfile/node.go

@@ -109,7 +109,3 @@ func getDefaultDir(entrypoint, dir string) string {
 
 	return dir
 }
-
-func isGitNode(entrypoint string) (bool, error) {
-
-}

taskfile/node_git.go

@@ -51,7 +51,6 @@ func NewGitNode(
 	if u.Scheme == "http" && !insecure {
 		return nil, &errors.TaskfileNotSecureError{URI: entrypoint}
 	}
-
 	return &GitNode{
 		BaseNode: base,
 		URL:      u,
@@ -115,5 +114,5 @@ func (node *GitNode) ResolveDir(dir string) (string, error) {
 }
 
 func (node *GitNode) FilenameAndLastDir() (string, string) {
-	return "", filepath.Base(node.Entrypoint)
+	return filepath.Base(node.path), filepath.Base(filepath.Dir(node.path))
 }

taskfile/node_git_test.go

@@ -53,3 +53,23 @@ func TestGitNode_httpsWithDir(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "https://github.com/foo/bar.git?ref=main//directory/common.yml", entrypoint)
 }
+
+func TestGitNode_FilenameAndDir(t *testing.T) {
+	node, err := NewGitNode("https://github.com/foo/bar.git?ref=main//directory/Taskfile.yml", "", false)
+	assert.NoError(t, err)
+	filename, dir := node.FilenameAndLastDir()
+	assert.Equal(t, "Taskfile.yml", filename)
+	assert.Equal(t, "directory", dir)
+
+	node, err = NewGitNode("https://github.com/foo/bar.git?ref=main//Taskfile.yml", "", false)
+	assert.NoError(t, err)
+	filename, dir = node.FilenameAndLastDir()
+	assert.Equal(t, "Taskfile.yml", filename)
+	assert.Equal(t, ".", dir)
+
+	node, err = NewGitNode("https://github.com/foo/bar.git?ref=main//multiple/directory/Taskfile.yml", "", false)
+	assert.NoError(t, err)
+	filename, dir = node.FilenameAndLastDir()
+	assert.Equal(t, "Taskfile.yml", filename)
+	assert.Equal(t, "directory", dir)
+}

taskfile/node_test.go

@@ -6,20 +6,17 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestIsGitNode(t *testing.T) {
-	isGit, err := isGitNode("https://github.com/foo/bar.git")
+func TestScheme(t *testing.T) {
+	scheme, err := getScheme("https://github.com/foo/bar.git")
 	assert.NoError(t, err)
-	assert.True(t, isGit)
-	isGit, err = isGitNode("https://github.com/foo/bar.git?ref=v1//taskfile/common.yml")
+	assert.Equal(t, "git", scheme)
+	scheme, err = getScheme("https://github.com/foo/bar.git?ref=v1//taskfile/common.yml")
 	assert.NoError(t, err)
-	assert.True(t, isGit)
-	isGit, err = isGitNode("[email protected]:foo/bar.git?ref=main//Taskfile.yml")
+	assert.Equal(t, "git", scheme)
+	scheme, err = getScheme("[email protected]:foo/bar.git?ref=main//Taskfile.yml")
 	assert.NoError(t, err)
-	assert.True(t, isGit)
-}
-
-func TestIsNotGitNode(t *testing.T) {
-	isGit, err := isGitNode("https://github.com/foo/common.yml")
+	assert.Equal(t, "git", scheme)
+	scheme, err = getScheme("https://github.com/foo/common.yml")
 	assert.NoError(t, err)
-	assert.False(t, isGit)
+	assert.Equal(t, "https", scheme)
 }