From 6437d0180b97a26319b50c2e22927dac7c94fcdd Mon Sep 17 00:00:00 2001 From: ᴜɴᴋɴᴡᴏɴ Date: Sun, 8 Mar 2020 19:09:31 +0800 Subject: git: migrate to github.com/gogs/git-module@v1.0.0 (#5958) * WIP * Finish `internal/db/git_diff.go` * FInish internal/db/mirror.go * Finish internal/db/pull.go * Finish internal/db/release.go * Finish internal/db/repo.go * Finish internal/db/repo_branch.go * Finish internal/db/repo_editor.go * Finish internal/db/update.go * Save my work * Add license header * Compile! * Merge master * Finish internal/cmd/hook.go * Finish internal/conf/static.go * Finish internal/context/repo.go * Finish internal/db/action.go * Finish internal/db/git_diff.go * Fix submodule URL inferring * Finish internal/db/mirror.go * Updat to beta.4 * css: update fonts * Finish internal/db/pull.go * Finish internal/db/release.go * Finish internal/db/repo_branch.go * Finish internal/db/wiki.go * gitutil: enhance infer submodule UR * Finish internal/route/api/v1/repo/commits.go * mirror: only collect branch commits after sync * mirror: fix tag support * Finish internal/db/repo.go * Finish internal/db/repo_editor.go * Finish internal/db/update.go * Finish internal/gitutil/pull_request.go * Make it compile * Finish internal/route/repo/setting.go * Finish internal/route/repo/branch.go * Finish internal/route/api/v1/repo/file.go * Finish internal/route/repo/download.go * Finish internal/route/repo/editor.go * Use helper * Finish internal/route/repo/issue.go * Finish internal/route/repo/pull.go * Finish internal/route/repo/release.go * Finish internal/route/repo/repo.go * Finish internal/route/repo/wiki.go * Finish internal/route/repo/commit.go * Finish internal/route/repo/view.go * Finish internal/gitutil/tag.go * go.sum --- internal/gitutil/pull_request_test.go | 108 ++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 internal/gitutil/pull_request_test.go (limited to 'internal/gitutil/pull_request_test.go') diff --git a/internal/gitutil/pull_request_test.go b/internal/gitutil/pull_request_test.go new file mode 100644 index 00000000..d7453ff3 --- /dev/null +++ b/internal/gitutil/pull_request_test.go @@ -0,0 +1,108 @@ +// Copyright 2020 The Gogs Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package gitutil + +import ( + "fmt" + "testing" + + "github.com/gogs/git-module" + "github.com/pkg/errors" + "github.com/stretchr/testify/assert" +) + +func TestModuler_PullRequestMeta(t *testing.T) { + headPath := "/head/path" + basePath := "/base/path" + headBranch := "head_branch" + baseBranch := "base_branch" + mergeBase := "MERGE-BASE" + changedFiles := []string{"a.go", "b.txt"} + commits := []*git.Commit{ + {ID: git.MustIDFromString("adfd6da3c0a3fb038393144becbf37f14f780087")}, + } + + MockModule.RepoAddRemote = func(repoPath, name, url string, opts ...git.AddRemoteOptions) error { + if repoPath != headPath { + return fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath) + } else if name == "" { + return errors.New("empty name") + } else if url != basePath { + return fmt.Errorf("url: want %q but got %q", basePath, url) + } + + if len(opts) == 0 { + return errors.New("no options") + } else if !opts[0].Fetch { + return fmt.Errorf("opts.Fetch: want %v but got %v", true, opts[0].Fetch) + } + + return nil + } + MockModule.RepoMergeBase = func(repoPath, base, head string, opts ...git.MergeBaseOptions) (string, error) { + if repoPath != headPath { + return "", fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath) + } else if base == "" { + return "", errors.New("empty base") + } else if head != headBranch { + return "", fmt.Errorf("head: want %q but got %q", headBranch, head) + } + + return mergeBase, nil + } + MockModule.RepoLog = func(repoPath, rev string, opts ...git.LogOptions) ([]*git.Commit, error) { + if repoPath != headPath { + return nil, fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath) + } + + expRev := mergeBase + "..." + headBranch + if rev != expRev { + return nil, fmt.Errorf("rev: want %q but got %q", expRev, rev) + } + + return commits, nil + } + MockModule.RepoDiffNameOnly = func(repoPath, base, head string, opts ...git.DiffNameOnlyOptions) ([]string, error) { + if repoPath != headPath { + return nil, fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath) + } else if base == "" { + return nil, errors.New("empty base") + } else if head != headBranch { + return nil, fmt.Errorf("head: want %q but got %q", headBranch, head) + } + + if len(opts) == 0 { + return nil, errors.New("no options") + } else if !opts[0].NeedsMergeBase { + return nil, fmt.Errorf("opts.NeedsMergeBase: want %v but got %v", true, opts[0].NeedsMergeBase) + } + + return changedFiles, nil + } + MockModule.RepoRemoveRemote = func(repoPath, name string, opts ...git.RemoveRemoteOptions) error { + if repoPath != headPath { + return fmt.Errorf("repoPath: want %q but got %q", headPath, repoPath) + } else if name == "" { + return errors.New("empty name") + } + + return nil + } + defer func() { + MockModule = MockModuleStore{} + }() + + meta, err := Module.PullRequestMeta(headPath, basePath, headBranch, baseBranch) + if err != nil { + t.Fatal(err) + } + + expMeta := &PullRequestMeta{ + MergeBase: mergeBase, + Commits: commits, + NumFiles: 2, + } + assert.Equal(t, expMeta, meta) +} -- cgit v1.2.3