From fb4453c18a7b53bb3b03006759221b50c856abb0 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Mon, 17 Jul 2023 19:55:29 +1000
Subject: [PATCH] Fix unit tests

---
 pkg/commands/git_commands/worktree.go          | 9 +++++----
 pkg/gui/controllers/helpers/worktree_helper.go | 4 ++--
 pkg/utils/date_test.go                         | 4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkg/commands/git_commands/worktree.go b/pkg/commands/git_commands/worktree.go
index cb108c46d..b8c25c47b 100644
--- a/pkg/commands/git_commands/worktree.go
+++ b/pkg/commands/git_commands/worktree.go
@@ -2,7 +2,6 @@ package git_commands
 
 import (
 	"errors"
-	"fmt"
 	"io/fs"
 	"log"
 	"os"
@@ -67,7 +66,7 @@ func (self *WorktreeCommands) IsCurrentWorktree(path string) bool {
 func IsCurrentWorktree(path string) bool {
 	pwd, err := os.Getwd()
 	if err != nil {
-		log.Fatalln(err.Error())
+		return false
 	}
 
 	return EqualPath(pwd, path)
@@ -78,7 +77,8 @@ func (self *WorktreeCommands) IsWorktreePathMissing(path string) bool {
 		if errors.Is(err, fs.ErrNotExist) {
 			return true
 		}
-		log.Fatalln(fmt.Errorf("failed to check if worktree path `%s` exists\n%w", path, err).Error())
+		self.Log.Errorf("failed to check if worktree path `%s` exists\n%v", path, err)
+		return false
 	}
 	return false
 }
@@ -118,7 +118,8 @@ func GetCurrentRepoPath() string {
 	gitPath := filepath.Join(pwd, ".git")
 	gitFileInfo, err := os.Stat(gitPath)
 	if err != nil {
-		log.Fatalln(err.Error())
+		// fallback
+		return currentPath()
 	}
 
 	if gitFileInfo.IsDir() {
diff --git a/pkg/gui/controllers/helpers/worktree_helper.go b/pkg/gui/controllers/helpers/worktree_helper.go
index db59b1afe..d75691525 100644
--- a/pkg/gui/controllers/helpers/worktree_helper.go
+++ b/pkg/gui/controllers/helpers/worktree_helper.go
@@ -64,7 +64,7 @@ func (self *WorktreeHelper) GetLinkedWorktreeName() string {
 func (self *WorktreeHelper) IsCurrentWorktree(w *models.Worktree) bool {
 	pwd, err := os.Getwd()
 	if err != nil {
-		self.c.Log.Errorf("failed to obtain current working directory: %w", err)
+		self.c.Log.Errorf("failed to obtain current working directory: %v", err)
 		return false
 	}
 
@@ -76,7 +76,7 @@ func (self *WorktreeHelper) IsWorktreePathMissing(w *models.Worktree) bool {
 		if errors.Is(err, fs.ErrNotExist) {
 			return true
 		}
-		self.c.Log.Errorf("failed to check if worktree path `%s` exists: %w", w.Path, err)
+		self.c.Log.Errorf("failed to check if worktree path `%s` exists: %v", w.Path, err)
 		return false
 	}
 	return false
diff --git a/pkg/utils/date_test.go b/pkg/utils/date_test.go
index 17deeed94..0162f5f67 100644
--- a/pkg/utils/date_test.go
+++ b/pkg/utils/date_test.go
@@ -68,12 +68,12 @@ func TestFormatSecondsAgo(t *testing.T) {
 		{
 			name: "six months",
 			args: SECONDS_IN_YEAR / 2,
-			want: "6m",
+			want: "6M",
 		},
 		{
 			name: "almost one year",
 			args: 31535999,
-			want: "11m",
+			want: "11M",
 		},
 		{
 			name: "one year",