|
|
|
@ -10,6 +10,7 @@ import (
|
|
|
|
|
"code.gitea.io/gitea/models"
|
|
|
|
|
"code.gitea.io/gitea/modules/git"
|
|
|
|
|
"code.gitea.io/gitea/modules/repository"
|
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
|
)
|
|
|
|
@ -208,6 +209,32 @@ func TestUpdateIssuesCommit(t *testing.T) {
|
|
|
|
|
models.AssertExistsAndLoadBean(t, commentBean)
|
|
|
|
|
models.AssertNotExistsBean(t, issueBean, "is_closed=1")
|
|
|
|
|
models.CheckConsistencyFor(t, &models.Action{})
|
|
|
|
|
|
|
|
|
|
pushCommits = []*repository.PushCommit{
|
|
|
|
|
{
|
|
|
|
|
Sha1: "abcdef3",
|
|
|
|
|
CommitterEmail: "user2@example.com",
|
|
|
|
|
CommitterName: "User Two",
|
|
|
|
|
AuthorEmail: "user2@example.com",
|
|
|
|
|
AuthorName: "User Two",
|
|
|
|
|
Message: "close " + setting.AppURL + repo.FullName() + "/pulls/1",
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
repo = models.AssertExistsAndLoadBean(t, &models.Repository{ID: 3}).(*models.Repository)
|
|
|
|
|
commentBean = &models.Comment{
|
|
|
|
|
Type: models.CommentTypeCommitRef,
|
|
|
|
|
CommitSHA: "abcdef3",
|
|
|
|
|
PosterID: user.ID,
|
|
|
|
|
IssueID: 6,
|
|
|
|
|
}
|
|
|
|
|
issueBean = &models.Issue{RepoID: repo.ID, Index: 1}
|
|
|
|
|
|
|
|
|
|
models.AssertNotExistsBean(t, commentBean)
|
|
|
|
|
models.AssertNotExistsBean(t, &models.Issue{RepoID: repo.ID, Index: 1}, "is_closed=1")
|
|
|
|
|
assert.NoError(t, UpdateIssuesCommit(user, repo, pushCommits, repo.DefaultBranch))
|
|
|
|
|
models.AssertExistsAndLoadBean(t, commentBean)
|
|
|
|
|
models.AssertExistsAndLoadBean(t, issueBean, "is_closed=1")
|
|
|
|
|
models.CheckConsistencyFor(t, &models.Action{})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestUpdateIssuesCommit_Colon(t *testing.T) {
|
|
|
|
@ -304,6 +331,41 @@ func TestUpdateIssuesCommit_AnotherRepo(t *testing.T) {
|
|
|
|
|
models.CheckConsistencyFor(t, &models.Action{})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestUpdateIssuesCommit_AnotherRepo_FullAddress(t *testing.T) {
|
|
|
|
|
assert.NoError(t, models.PrepareTestDatabase())
|
|
|
|
|
user := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
|
|
|
|
|
|
|
|
|
|
// Test that a push to default branch closes issue in another repo
|
|
|
|
|
// If the user also has push permissions to that repo
|
|
|
|
|
pushCommits := []*repository.PushCommit{
|
|
|
|
|
{
|
|
|
|
|
Sha1: "abcdef1",
|
|
|
|
|
CommitterEmail: "user2@example.com",
|
|
|
|
|
CommitterName: "User Two",
|
|
|
|
|
AuthorEmail: "user2@example.com",
|
|
|
|
|
AuthorName: "User Two",
|
|
|
|
|
Message: "close " + setting.AppURL + "user2/repo1/issues/1",
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 2}).(*models.Repository)
|
|
|
|
|
commentBean := &models.Comment{
|
|
|
|
|
Type: models.CommentTypeCommitRef,
|
|
|
|
|
CommitSHA: "abcdef1",
|
|
|
|
|
PosterID: user.ID,
|
|
|
|
|
IssueID: 1,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
issueBean := &models.Issue{RepoID: 1, Index: 1, ID: 1}
|
|
|
|
|
|
|
|
|
|
models.AssertNotExistsBean(t, commentBean)
|
|
|
|
|
models.AssertNotExistsBean(t, issueBean, "is_closed=1")
|
|
|
|
|
assert.NoError(t, UpdateIssuesCommit(user, repo, pushCommits, repo.DefaultBranch))
|
|
|
|
|
models.AssertExistsAndLoadBean(t, commentBean)
|
|
|
|
|
models.AssertExistsAndLoadBean(t, issueBean, "is_closed=1")
|
|
|
|
|
models.CheckConsistencyFor(t, &models.Action{})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestUpdateIssuesCommit_AnotherRepoNoPermission(t *testing.T) {
|
|
|
|
|
assert.NoError(t, models.PrepareTestDatabase())
|
|
|
|
|
user := models.AssertExistsAndLoadBean(t, &models.User{ID: 10}).(*models.User)
|
|
|
|
@ -319,6 +381,14 @@ func TestUpdateIssuesCommit_AnotherRepoNoPermission(t *testing.T) {
|
|
|
|
|
AuthorName: "User Ten",
|
|
|
|
|
Message: "close user3/repo3#1",
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
Sha1: "abcdef4",
|
|
|
|
|
CommitterEmail: "user10@example.com",
|
|
|
|
|
CommitterName: "User Ten",
|
|
|
|
|
AuthorEmail: "user10@example.com",
|
|
|
|
|
AuthorName: "User Ten",
|
|
|
|
|
Message: "close " + setting.AppURL + "user3/repo3/issues/1",
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 6}).(*models.Repository)
|
|
|
|
@ -328,13 +398,21 @@ func TestUpdateIssuesCommit_AnotherRepoNoPermission(t *testing.T) {
|
|
|
|
|
PosterID: user.ID,
|
|
|
|
|
IssueID: 6,
|
|
|
|
|
}
|
|
|
|
|
commentBean2 := &models.Comment{
|
|
|
|
|
Type: models.CommentTypeCommitRef,
|
|
|
|
|
CommitSHA: "abcdef4",
|
|
|
|
|
PosterID: user.ID,
|
|
|
|
|
IssueID: 6,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
issueBean := &models.Issue{RepoID: 3, Index: 1, ID: 6}
|
|
|
|
|
|
|
|
|
|
models.AssertNotExistsBean(t, commentBean)
|
|
|
|
|
models.AssertNotExistsBean(t, commentBean2)
|
|
|
|
|
models.AssertNotExistsBean(t, issueBean, "is_closed=1")
|
|
|
|
|
assert.NoError(t, UpdateIssuesCommit(user, repo, pushCommits, repo.DefaultBranch))
|
|
|
|
|
models.AssertNotExistsBean(t, commentBean)
|
|
|
|
|
models.AssertNotExistsBean(t, commentBean2)
|
|
|
|
|
models.AssertNotExistsBean(t, issueBean, "is_closed=1")
|
|
|
|
|
models.CheckConsistencyFor(t, &models.Action{})
|
|
|
|
|
}
|
|
|
|
|