mirror of
https://github.com/go-gitea/gitea.git
synced 2025-02-20 11:43:57 +08:00
Refactor gitdiff test (#33507)
This commit is contained in:
parent
7e596bd7a9
commit
fa0c8ae50f
@ -5,6 +5,7 @@
|
|||||||
package gitdiff
|
package gitdiff
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
@ -628,23 +629,25 @@ func TestDiffLine_GetCommentSide(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetDiffRangeWithWhitespaceBehavior(t *testing.T) {
|
func TestGetDiffRangeWithWhitespaceBehavior(t *testing.T) {
|
||||||
gitRepo, err := git.OpenRepository(git.DefaultContext, "./testdata/academic-module")
|
gitRepo, err := git.OpenRepository(context.Background(), "../../modules/git/tests/repos/repo5_pulls")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
defer gitRepo.Close()
|
defer gitRepo.Close()
|
||||||
for _, behavior := range []git.TrustedCmdArgs{{"-w"}, {"--ignore-space-at-eol"}, {"-b"}, nil} {
|
for _, behavior := range []git.TrustedCmdArgs{{"-w"}, {"--ignore-space-at-eol"}, {"-b"}, nil} {
|
||||||
diffs, err := GetDiff(db.DefaultContext, gitRepo,
|
diffs, err := GetDiff(context.Background(), gitRepo,
|
||||||
&DiffOptions{
|
&DiffOptions{
|
||||||
AfterCommitID: "bd7063cc7c04689c4d082183d32a604ed27a24f9",
|
AfterCommitID: "d8e0bbb45f200e67d9a784ce55bd90821af45ebd",
|
||||||
BeforeCommitID: "559c156f8e0178b71cb44355428f24001b08fc68",
|
BeforeCommitID: "72866af952e98d02a73003501836074b286a78f6",
|
||||||
MaxLines: setting.Git.MaxGitDiffLines,
|
MaxLines: setting.Git.MaxGitDiffLines,
|
||||||
MaxLineCharacters: setting.Git.MaxGitDiffLineCharacters,
|
MaxLineCharacters: setting.Git.MaxGitDiffLineCharacters,
|
||||||
MaxFiles: setting.Git.MaxGitDiffFiles,
|
MaxFiles: 1,
|
||||||
WhitespaceBehavior: behavior,
|
WhitespaceBehavior: behavior,
|
||||||
})
|
})
|
||||||
assert.NoError(t, err, "Error when diff with %s", behavior)
|
require.NoError(t, err, "Error when diff with WhitespaceBehavior=%s", behavior)
|
||||||
|
assert.True(t, diffs.IsIncomplete)
|
||||||
|
assert.Len(t, diffs.Files, 1)
|
||||||
for _, f := range diffs.Files {
|
for _, f := range diffs.Files {
|
||||||
assert.NotEmpty(t, f.Sections, "%s should have sections", f.Name)
|
assert.NotEmpty(t, f.Sections, "Diff file %q should have sections", f.Name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1 +0,0 @@
|
|||||||
ref: refs/heads/master
|
|
10
services/gitdiff/testdata/academic-module/config
vendored
10
services/gitdiff/testdata/academic-module/config
vendored
@ -1,10 +0,0 @@
|
|||||||
[core]
|
|
||||||
repositoryformatversion = 0
|
|
||||||
filemode = true
|
|
||||||
bare = false
|
|
||||||
logallrefupdates = true
|
|
||||||
ignorecase = true
|
|
||||||
precomposeunicode = true
|
|
||||||
[branch "master"]
|
|
||||||
remote = origin
|
|
||||||
merge = refs/heads/master
|
|
BIN
services/gitdiff/testdata/academic-module/index
vendored
BIN
services/gitdiff/testdata/academic-module/index
vendored
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
0000000000000000000000000000000000000000 bd7063cc7c04689c4d082183d32a604ed27a24f9 Lunny Xiao <xiaolunwen@gmail.com> 1574829684 +0800 clone: from https://try.gitea.io/shemgp-aiias/academic-module
|
|
@ -1 +0,0 @@
|
|||||||
0000000000000000000000000000000000000000 bd7063cc7c04689c4d082183d32a604ed27a24f9 Lunny Xiao <xiaolunwen@gmail.com> 1574829684 +0800 clone: from https://try.gitea.io/shemgp-aiias/academic-module
|
|
@ -1 +0,0 @@
|
|||||||
0000000000000000000000000000000000000000 bd7063cc7c04689c4d082183d32a604ed27a24f9 Lunny Xiao <xiaolunwen@gmail.com> 1574829684 +0800 clone: from https://try.gitea.io/shemgp-aiias/academic-module
|
|
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
|||||||
# pack-refs with: peeled fully-peeled sorted
|
|
||||||
bd7063cc7c04689c4d082183d32a604ed27a24f9 refs/remotes/origin/master
|
|
@ -1 +0,0 @@
|
|||||||
bd7063cc7c04689c4d082183d32a604ed27a24f9
|
|
@ -1 +0,0 @@
|
|||||||
ref: refs/remotes/origin/master
|
|
Loading…
x
Reference in New Issue
Block a user