mirror of
https://github.com/go-gitea/gitea.git
synced 2026-07-11 20:54:39 +00:00
Committer can also be co-author, it should only not be included in the co-author list if it is not in the "Co-author-by" list. * Author & Co-author: they changed the code (attribution) * Committer: they submitted the commit but didn't change the code (e.g.: maintainer signed a commit) Fix #38384
130 lines
4.2 KiB
Go
130 lines
4.2 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package git
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestCommitMessageSanitizesInvalidUTF8(t *testing.T) {
|
|
commit := &Commit{
|
|
CommitMessage: CommitMessage{MessageRaw: "title \xff\n\n\n\nbody \xff\n\n\n"},
|
|
}
|
|
assert.Equal(t, "title ÿ", commit.MessageTitle())
|
|
assert.Equal(t, "body ÿ", commit.MessageBody())
|
|
assert.Equal(t, "title ÿ\n\n\n\nbody ÿ\n\n\n", commit.MessageUTF8())
|
|
}
|
|
|
|
func TestCommitMessageTrailer(t *testing.T) {
|
|
cases := []struct {
|
|
msg, body, sep, trailer string
|
|
}{
|
|
{"", "", "", ""},
|
|
{"a", "a", "", ""},
|
|
{"a\n\nk", "a\n\nk", "", ""},
|
|
{"a\n\nk:v", "a", "\n\n", "k:v"},
|
|
{"a\n\nk:v\n\n", "a", "\n\n", "k:v\n\n"},
|
|
{"a\n--\nk:v", "a\n--\nk:v", "", ""},
|
|
{"a\n---\nk:v", "a", "\n---\n", "k:v"},
|
|
{"a\n\n---\n\nk:v", "a\n", "\n---\n\n", "k:v"},
|
|
|
|
{"k: v", "", "", "k: v"},
|
|
{"\nk:v", "", "\n", "k:v"},
|
|
{"\n\nk:v", "", "\n\n", "k:v"},
|
|
|
|
{"---\nk:v", "", "---\n", "k:v"},
|
|
{"\n---\nk:v", "", "\n---\n", "k:v"},
|
|
{"a:b\n---\nk:v", "a:b", "\n---\n", "k:v"},
|
|
}
|
|
for _, c := range cases {
|
|
body, sep, trailer := CommitMessageSplitTrailer(c.msg)
|
|
assert.Equal(t, c.body, body, "input=%q", c.msg)
|
|
assert.Equal(t, c.sep, sep, "input=%q", c.msg)
|
|
assert.Equal(t, c.trailer, trailer, "input=%q", c.msg)
|
|
}
|
|
}
|
|
|
|
func TestCommitMessageParticipants(t *testing.T) {
|
|
sig := func(n, e string) *Signature { return &Signature{Name: n, Email: e} }
|
|
idt := func(n, e string, r int) *CommitIdentity { return &CommitIdentity{n, e, r} }
|
|
roleAuthor, roleCommitter, roleCoAuthor := commitIdentityRoleAuthor, commitIdentityRoleCommitter, commitIdentityRoleCoAuthor
|
|
type testCase struct {
|
|
name string
|
|
commit *Commit
|
|
identities []*CommitIdentity
|
|
}
|
|
t.Run("AllParticipants", func(t *testing.T) {
|
|
cases := []testCase{
|
|
{
|
|
"DifferentUsers",
|
|
&Commit{
|
|
Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"),
|
|
CommitMessage: CommitMessage{MessageRaw: "CO-Authored-BY: x@m.com"},
|
|
},
|
|
[]*CommitIdentity{idt("a", "a@m.com", roleAuthor), idt("c", "c@m.com", roleCommitter), idt("", "x@m.com", roleCoAuthor)},
|
|
},
|
|
{
|
|
"SameUser",
|
|
&Commit{
|
|
Author: sig("a", "a@m.com"), Committer: sig("a", "A@M.com"),
|
|
CommitMessage: CommitMessage{MessageRaw: "CO-Authored-BY: a@m.com"},
|
|
},
|
|
[]*CommitIdentity{idt("a", "a@m.com", roleAuthor)},
|
|
},
|
|
{
|
|
"NoCommitter",
|
|
&Commit{
|
|
Author: sig("a", "a@m.com"), Committer: sig("", ""),
|
|
CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: Full Name <X@M.com>"},
|
|
},
|
|
[]*CommitIdentity{idt("a", "a@m.com", roleAuthor), idt("Full Name", "X@M.com", roleCoAuthor)},
|
|
},
|
|
}
|
|
for _, c := range cases {
|
|
assert.Equal(t, c.identities, c.commit.AllParticipantIdentities(), "case: %s", c.name)
|
|
}
|
|
})
|
|
t.Run("CoAuthors", func(t *testing.T) {
|
|
cases := []testCase{
|
|
{
|
|
"GenuineCoAuthor",
|
|
&Commit{
|
|
Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"),
|
|
CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: x <x@m.com>"},
|
|
},
|
|
[]*CommitIdentity{idt("x", "x@m.com", roleCoAuthor)},
|
|
},
|
|
{
|
|
"CoAuthorIsCommitter",
|
|
&Commit{
|
|
Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"),
|
|
CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: c <c@m.com>"},
|
|
},
|
|
[]*CommitIdentity{idt("c", "c@m.com", roleCoAuthor)},
|
|
},
|
|
{
|
|
"CoAuthorIsAuthor",
|
|
&Commit{
|
|
Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"),
|
|
CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: a <a@m.com>"},
|
|
},
|
|
[]*CommitIdentity{},
|
|
},
|
|
{
|
|
"CoAuthorCommitterNameWithIndex", // restore the committer co-author to the co-author list by the index with correct name
|
|
&Commit{
|
|
Author: sig("a", "a@m.com"), Committer: sig("c", "c@m.com"),
|
|
CommitMessage: CommitMessage{MessageRaw: "Co-authored-by: x <x@m.com>\nCo-authored-by: c-other <c@m.com>\nCo-authored-by: y <y@m.com>"},
|
|
},
|
|
[]*CommitIdentity{idt("x", "x@m.com", roleCoAuthor), idt("c-other", "c@m.com", roleCoAuthor), idt("y", "y@m.com", roleCoAuthor)},
|
|
},
|
|
}
|
|
for _, c := range cases {
|
|
assert.Equal(t, c.identities, c.commit.CoAuthorIdentities(), "case: %s", c.name)
|
|
}
|
|
})
|
|
}
|