diff options
author | Steve Moyer <smoyer1@selesy.com> | 2022-06-22 10:38:09 -0400 |
---|---|---|
committer | Steve Moyer <smoyer1@selesy.com> | 2022-06-22 10:38:09 -0400 |
commit | 6fc6a0f0ab8ce8c7b6ec510d1d7557a6e7cd6835 (patch) | |
tree | 9cd772fc325ed8a15c76306f458c4fef736fd94d | |
parent | 52c724a03334dda9df30dbac22cb22a04cbe4260 (diff) | |
download | git-bug-6fc6a0f0ab8ce8c7b6ec510d1d7557a6e7cd6835.tar.gz |
test(809): remove reliance on repo's filesystem
-rw-r--r-- | commands/add_test.go | 10 | ||||
-rw-r--r-- | commands/env_testing.go | 3 | ||||
-rw-r--r-- | commands/rm_test.go | 2 | ||||
-rw-r--r-- | commands/user_create_test.go | 16 |
4 files changed, 15 insertions, 16 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 48807725..1493a190 100644 --- a/commands/env_testing.go +++ b/commands/env_testing.go @@ -12,7 +12,6 @@ import ( type testEnv struct { env *Env - cwd string out *bytes.Buffer } @@ -20,7 +19,6 @@ func newTestEnv(t *testing.T) *testEnv { t.Helper() repo := repository.CreateGoGitTestRepo(t, false) - cwd := repository.RepoDir(t, repo) buf := new(bytes.Buffer) @@ -37,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/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) } |