Merge pull request #817 from MichaelMure/refactor/guarantee-test-cleanup

refactor(809): guarantee test cleanup

5 files changed, 17 insertions, 24 deletions

diff --git a/commands/add_test.go b/commands/add_test.go
index 63eda06e..077995a6 100644
--- a/commands/add_test.go
+++ b/commands/add_test.go
@@ -7,10 +7,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func newTestEnvUserAndBug(t *testing.T) (*testEnv, string, string) {
+func newTestEnvAndBug(t *testing.T) (*testEnv, string) {
 	t.Helper()
 
-	testEnv, userID := newTestEnvAndUser(t)
+	testEnv, _ := newTestEnvAndUser(t)
 	opts := addOptions{
 		title:          "this is a bug title",
 		message:        "this is a bug message",
@@ -23,10 +23,10 @@ func newTestEnvUserAndBug(t *testing.T) (*testEnv, string, string) {
 	bugID := strings.Split(testEnv.out.String(), " ")[0]
 	testEnv.out.Reset()
 
-	return testEnv, userID, bugID
+	return testEnv, bugID
 }
 
 func TestAdd(t *testing.T) {
-	_, _, user := newTestEnvUserAndBug(t)
-	require.Regexp(t, "^[0-9A-Fa-f]{7}$", user)
+	_, bugID := newTestEnvAndBug(t)
+	require.Regexp(t, "^[0-9A-Fa-f]{7}$", bugID)
 }
diff --git a/commands/env_testing.go b/commands/env_testing.go
index 4de66a9d..1493a190 100644
--- a/commands/env_testing.go
+++ b/commands/env_testing.go
@@ -12,20 +12,13 @@ import (
 
 type testEnv struct {
 	env *Env
-	cwd string
 	out *bytes.Buffer
 }
 
 func newTestEnv(t *testing.T) *testEnv {
 	t.Helper()
 
-	cwd := t.TempDir()
-
-	repo, err := repository.InitGoGitRepo(cwd, gitBugNamespace)
-	require.NoError(t, err)
-	t.Cleanup(func() {
-		require.NoError(t, repo.Close())
-	})
+	repo := repository.CreateGoGitTestRepo(t, false)
 
 	buf := new(bytes.Buffer)
 
@@ -42,7 +35,6 @@ func newTestEnv(t *testing.T) *testEnv {
 			out:     out{Writer: buf},
 			err:     out{Writer: buf},
 		},
-		cwd: cwd,
 		out: buf,
 	}
 }
diff --git a/commands/rm_test.go b/commands/rm_test.go
index 5d4e7cca..0156bbd4 100644
--- a/commands/rm_test.go
+++ b/commands/rm_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestRm(t *testing.T) {
-	testEnv, _, bugID := newTestEnvUserAndBug(t)
+	testEnv, bugID := newTestEnvAndBug(t)
 
 	exp := "bug " + bugID + " removed\n"
 
diff --git a/commands/select/select_test.go b/commands/select/select_test.go
index 488ab357..702700f4 100644
--- a/commands/select/select_test.go
+++ b/commands/select/select_test.go
@@ -11,8 +11,7 @@ import (
 )
 
 func TestSelect(t *testing.T) {
-	repo := repository.CreateGoGitTestRepo(false)
-	defer repository.CleanupTestRepos(repo)
+	repo := repository.CreateGoGitTestRepo(t, false)
 
 	repoCache, err := cache.NewRepoCache(repo)
 	require.NoError(t, err)
diff --git a/commands/user_create_test.go b/commands/user_create_test.go
index 223e7ec3..08958344 100644
--- a/commands/user_create_test.go
+++ b/commands/user_create_test.go
@@ -1,21 +1,25 @@
 package commands
 
 import (
-	"path/filepath"
 	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
+const (
+	testUserName  = "John Doe"
+	testUserEmail = "jdoe@example.com"
+)
+
 func newTestEnvAndUser(t *testing.T) (*testEnv, string) {
 	t.Helper()
 
 	testEnv := newTestEnv(t)
 
 	opts := createUserOptions{
-		name:           "John Doe",
-		email:          "jdoe@example.com",
+		name:           testUserName,
+		email:          testUserEmail,
 		avatarURL:      "",
 		nonInteractive: true,
 	}
@@ -29,8 +33,6 @@ func newTestEnvAndUser(t *testing.T) (*testEnv, string) {
 }
 
 func TestUserCreateCommand(t *testing.T) {
-	testEnv, userID := newTestEnvAndUser(t)
-
-	require.FileExists(t, filepath.Join(testEnv.cwd, ".git", "refs", "identities", userID))
-	require.FileExists(t, filepath.Join(testEnv.cwd, ".git", "git-bug", "identity-cache"))
+	_, userID := newTestEnvAndUser(t)
+	require.Regexp(t, "[0-9a-f]{64}", userID)
 }