diff options
author | ᴜɴᴋɴᴡᴏɴ <u@gogs.io> | 2020-03-29 20:15:42 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-29 20:15:42 +0800 |
commit | 4cbb43b860548da07132bcec79e42cbc038a9a36 (patch) | |
tree | 96ea979f709024a3e179c8b21aa58a26a11fa389 | |
parent | 933206f1fe55dd3444315bcb51e45f7a4277909a (diff) |
gitutil: simplify mock with `t.Cleanup` (#6033)
* gitutil: simplify mock with t.Cleanup
* Scope mock to tests only
-rw-r--r-- | internal/gitutil/mock_test.go (renamed from internal/gitutil/mock.go) | 10 | ||||
-rw-r--r-- | internal/gitutil/pull_request_test.go | 7 | ||||
-rw-r--r-- | internal/gitutil/tag_test.go | 7 |
3 files changed, 12 insertions, 12 deletions
diff --git a/internal/gitutil/mock.go b/internal/gitutil/mock_test.go index 73727c31..161d4474 100644 --- a/internal/gitutil/mock.go +++ b/internal/gitutil/mock_test.go @@ -5,6 +5,8 @@ package gitutil import ( + "testing" + "github.com/gogs/git-module" ) @@ -54,3 +56,11 @@ func (m *MockModuleStore) PullRequestMeta(headPath, basePath, headBranch, baseBr func (m *MockModuleStore) ListTagsAfter(repoPath, after string, limit int) (*TagsPage, error) { return m.listTagsAfter(repoPath, after, limit) } + +func SetMockModuleStore(t *testing.T, mock ModuleStore) { + before := Module + Module = mock + t.Cleanup(func() { + Module = before + }) +} diff --git a/internal/gitutil/pull_request_test.go b/internal/gitutil/pull_request_test.go index 1322a674..ca0b40ad 100644 --- a/internal/gitutil/pull_request_test.go +++ b/internal/gitutil/pull_request_test.go @@ -24,7 +24,7 @@ func TestModuler_PullRequestMeta(t *testing.T) { {ID: git.MustIDFromString("adfd6da3c0a3fb038393144becbf37f14f780087")}, } - mockModule := &MockModuleStore{ + SetMockModuleStore(t, &MockModuleStore{ repoAddRemote: func(repoPath, name, url string, opts ...git.AddRemoteOptions) error { if repoPath != headPath { return fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath) @@ -93,11 +93,6 @@ func TestModuler_PullRequestMeta(t *testing.T) { }, pullRequestMeta: Module.PullRequestMeta, - } - beforeModule := Module - Module = mockModule - t.Cleanup(func() { - Module = beforeModule }) meta, err := Module.PullRequestMeta(headPath, basePath, headBranch, baseBranch) diff --git a/internal/gitutil/tag_test.go b/internal/gitutil/tag_test.go index 7f61baf7..f8fb2a03 100644 --- a/internal/gitutil/tag_test.go +++ b/internal/gitutil/tag_test.go @@ -12,7 +12,7 @@ import ( ) func TestModuler_ListTagsAfter(t *testing.T) { - mockModule := &MockModuleStore{ + SetMockModuleStore(t, &MockModuleStore{ repoTags: func(string, ...git.TagsOptions) ([]string, error) { return []string{ "v2.3.0", "v2.2.1", "v2.1.0", @@ -22,11 +22,6 @@ func TestModuler_ListTagsAfter(t *testing.T) { }, listTagsAfter: Module.ListTagsAfter, - } - beforeModule := Module - Module = mockModule - t.Cleanup(func() { - Module = beforeModule }) tests := []struct { |