Improve tests

wakatime · Dec 18, 2023 · 9e75bfb · 9e75bfb
1 parent 63781d4
commit 9e75bfb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/on_push.yml b/.github/workflows/on_push.yml
@@ -5,7 +5,7 @@ on:
     types: [opened, reopened, ready_for_review, synchronize]
   push:
     branches: [develop, release]
-    tags-ignore: "**"
+    tags-ignore: ["**"]
 
 env:
   GO_VERSION_FILE: "go.mod"

diff --git a/pkg/project/file.go b/pkg/project/file.go
@@ -36,10 +36,10 @@ func (f File) Detect() (Result, bool, error) {
 		Folder: filepath.Dir(fp),
 	}
 
+	result.Project = filepath.Base(filepath.Dir(fp))
+
 	if len(lines) > 0 {
 		result.Project = strings.TrimSpace(lines[0])
-	} else {
-		result.Project = filepath.Base(filepath.Dir(fp))
 	}
 
 	if len(lines) > 1 {

diff --git a/pkg/project/project_test.go b/pkg/project/project_test.go
@@ -509,11 +509,10 @@ func TestDetect_EmptyFileDetected(t *testing.T) {
 	err = os.Mkdir(filepath.Join(tmpDir, "wakatime-cli"), os.FileMode(int(0700)))
 	require.NoError(t, err)
 
-	copyFile(
-		t,
-		"testdata/wakatime-project-empty",
-		filepath.Join(tmpDir, "wakatime-cli", ".wakatime-project"),
-	)
+	tmpWakatimeProjectEmpty, err := os.Create(filepath.Join(tmpDir, "wakatime-cli", ".wakatime-project"))
+	require.NoError(t, err)
+
+	defer tmpWakatimeProjectEmpty.Close()
 
 	copyFile(
 		t,

diff --git a/pkg/project/testdata/wakatime-project-empty b/pkg/project/testdata/wakatime-project-empty