mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-02-14 19:40:48 -05:00
Compare commits
9 commits
a68a37f59c
...
66b6917923
Author | SHA1 | Date | |
---|---|---|---|
![]() |
66b6917923 | ||
![]() |
397b3cf88f | ||
![]() |
bcb72df356 | ||
![]() |
ed2d5f6b73 | ||
![]() |
eda6b436dc | ||
![]() |
09a35a7cb8 | ||
![]() |
8a65c4d28d | ||
![]() |
d624a5edd6 | ||
![]() |
11f71dcb09 |
8 changed files with 464 additions and 21 deletions
|
@ -146,7 +146,11 @@ func (run *ActionRun) GetPushEventPayload() (*api.PushPayload, error) {
|
|||
}
|
||||
|
||||
func (run *ActionRun) GetPullRequestEventPayload() (*api.PullRequestPayload, error) {
|
||||
if run.Event == webhook_module.HookEventPullRequest || run.Event == webhook_module.HookEventPullRequestSync {
|
||||
if run.Event == webhook_module.HookEventPullRequest ||
|
||||
run.Event == webhook_module.HookEventPullRequestSync ||
|
||||
run.Event == webhook_module.HookEventPullRequestAssign ||
|
||||
run.Event == webhook_module.HookEventPullRequestMilestone ||
|
||||
run.Event == webhook_module.HookEventPullRequestLabel {
|
||||
var payload api.PullRequestPayload
|
||||
if err := json.Unmarshal([]byte(run.EventPayload), &payload); err != nil {
|
||||
return nil, err
|
||||
|
|
|
@ -111,9 +111,7 @@ func NewIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *user_m
|
|||
return err
|
||||
}
|
||||
|
||||
issue.isLabelsLoaded = false
|
||||
issue.Labels = nil
|
||||
if err = issue.LoadLabels(ctx); err != nil {
|
||||
if err = issue.ReloadLabels(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -161,10 +159,7 @@ func NewIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer *us
|
|||
return err
|
||||
}
|
||||
|
||||
// reload all labels
|
||||
issue.isLabelsLoaded = false
|
||||
issue.Labels = nil
|
||||
if err = issue.LoadLabels(ctx); err != nil {
|
||||
if err = issue.ReloadLabels(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
@ -205,8 +200,7 @@ func DeleteIssueLabel(ctx context.Context, issue *Issue, label *Label, doer *use
|
|||
return err
|
||||
}
|
||||
|
||||
issue.Labels = nil
|
||||
return issue.LoadLabels(ctx)
|
||||
return issue.ReloadLabels(ctx)
|
||||
}
|
||||
|
||||
// DeleteLabelsByRepoID deletes labels of some repository
|
||||
|
@ -326,14 +320,23 @@ func FixIssueLabelWithOutsideLabels(ctx context.Context) (int64, error) {
|
|||
return res.RowsAffected()
|
||||
}
|
||||
|
||||
// LoadLabels loads labels
|
||||
// LoadLabels only if they are not already set
|
||||
func (issue *Issue) LoadLabels(ctx context.Context) (err error) {
|
||||
if !issue.isLabelsLoaded && issue.Labels == nil && issue.ID != 0 {
|
||||
if !issue.isLabelsLoaded && issue.Labels == nil {
|
||||
if err := issue.ReloadLabels(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
issue.isLabelsLoaded = true
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (issue *Issue) ReloadLabels(ctx context.Context) (err error) {
|
||||
if issue.ID != 0 {
|
||||
issue.Labels, err = GetLabelsByIssueID(ctx, issue.ID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("getLabelsByIssueID [%d]: %w", issue.ID, err)
|
||||
}
|
||||
issue.isLabelsLoaded = true
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
@ -496,8 +499,7 @@ func ReplaceIssueLabels(ctx context.Context, issue *Issue, labels []*Label, doer
|
|||
}
|
||||
}
|
||||
|
||||
issue.Labels = nil
|
||||
if err = issue.LoadLabels(ctx); err != nil {
|
||||
if err = issue.ReloadLabels(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
@ -15,6 +15,114 @@ import (
|
|||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestIssueNewIssueLabels(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
|
||||
label1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
|
||||
label2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4})
|
||||
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
|
||||
label3 := &issues_model.Label{RepoID: 1, Name: "label3", Color: "#123"}
|
||||
require.NoError(t, issues_model.NewLabel(db.DefaultContext, label3))
|
||||
|
||||
// label1 is already set, do nothing
|
||||
// label3 is new, add it
|
||||
require.NoError(t, issues_model.NewIssueLabels(db.DefaultContext, issue, []*issues_model.Label{label1, label3}, doer))
|
||||
|
||||
assert.Len(t, issue.Labels, 3)
|
||||
// check that the pre-existing label1 is still present
|
||||
assert.Equal(t, label1.ID, issue.Labels[0].ID)
|
||||
// check that new label3 was added
|
||||
assert.Equal(t, label3.ID, issue.Labels[1].ID)
|
||||
// check that pre-existing label2 was not removed
|
||||
assert.Equal(t, label2.ID, issue.Labels[2].ID)
|
||||
}
|
||||
|
||||
func TestIssueNewIssueLabel(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 3})
|
||||
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
|
||||
label := &issues_model.Label{RepoID: 1, Name: "label3", Color: "#123"}
|
||||
require.NoError(t, issues_model.NewLabel(db.DefaultContext, label))
|
||||
|
||||
require.NoError(t, issues_model.NewIssueLabel(db.DefaultContext, issue, label, doer))
|
||||
|
||||
assert.Len(t, issue.Labels, 1)
|
||||
assert.Equal(t, label.ID, issue.Labels[0].ID)
|
||||
}
|
||||
|
||||
func TestIssueReplaceIssueLabels(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
|
||||
label1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
|
||||
label2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4})
|
||||
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
|
||||
label3 := &issues_model.Label{RepoID: 1, Name: "label3", Color: "#123"}
|
||||
require.NoError(t, issues_model.NewLabel(db.DefaultContext, label3))
|
||||
|
||||
issue.LoadLabels(db.DefaultContext)
|
||||
assert.Len(t, issue.Labels, 2)
|
||||
assert.Equal(t, label1.ID, issue.Labels[0].ID)
|
||||
assert.Equal(t, label2.ID, issue.Labels[1].ID)
|
||||
|
||||
// label1 is already set, do nothing
|
||||
// label3 is new, add it
|
||||
// label2 is not in the list but already set, remove it
|
||||
require.NoError(t, issues_model.ReplaceIssueLabels(db.DefaultContext, issue, []*issues_model.Label{label1, label3}, doer))
|
||||
|
||||
assert.Len(t, issue.Labels, 2)
|
||||
assert.Equal(t, label1.ID, issue.Labels[0].ID)
|
||||
assert.Equal(t, label3.ID, issue.Labels[1].ID)
|
||||
}
|
||||
|
||||
func TestIssueDeleteIssueLabel(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
|
||||
label1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
|
||||
label2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4})
|
||||
doer := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||
|
||||
issue.LoadLabels(db.DefaultContext)
|
||||
assert.Len(t, issue.Labels, 2)
|
||||
assert.Equal(t, label1.ID, issue.Labels[0].ID)
|
||||
assert.Equal(t, label2.ID, issue.Labels[1].ID)
|
||||
|
||||
require.NoError(t, issues_model.DeleteIssueLabel(db.DefaultContext, issue, label2, doer))
|
||||
|
||||
assert.Len(t, issue.Labels, 1)
|
||||
assert.Equal(t, label1.ID, issue.Labels[0].ID)
|
||||
}
|
||||
|
||||
func TestIssueLoadLabels(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 2})
|
||||
label1 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 1})
|
||||
label2 := unittest.AssertExistsAndLoadBean(t, &issues_model.Label{ID: 4})
|
||||
|
||||
assert.Empty(t, issue.Labels)
|
||||
issue.LoadLabels(db.DefaultContext)
|
||||
assert.Len(t, issue.Labels, 2)
|
||||
assert.Equal(t, label1.ID, issue.Labels[0].ID)
|
||||
assert.Equal(t, label2.ID, issue.Labels[1].ID)
|
||||
|
||||
unittest.AssertSuccessfulDelete(t, &issues_model.IssueLabel{IssueID: issue.ID, LabelID: label2.ID})
|
||||
|
||||
// the database change is not noticed because the labels are cached
|
||||
issue.LoadLabels(db.DefaultContext)
|
||||
assert.Len(t, issue.Labels, 2)
|
||||
|
||||
issue.ReloadLabels(db.DefaultContext)
|
||||
assert.Len(t, issue.Labels, 1)
|
||||
assert.Equal(t, label1.ID, issue.Labels[0].ID)
|
||||
}
|
||||
|
||||
func TestNewIssueLabelsScope(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
|
||||
|
|
|
@ -362,6 +362,7 @@ type IssuePayload struct {
|
|||
Repository *Repository `json:"repository"`
|
||||
Sender *User `json:"sender"`
|
||||
CommitID string `json:"commit_id"`
|
||||
Label *Label `json:"label,omitempty"`
|
||||
}
|
||||
|
||||
// JSONPayload encodes the IssuePayload to JSON, with an indentation of two spaces.
|
||||
|
@ -399,6 +400,7 @@ type PullRequestPayload struct {
|
|||
Sender *User `json:"sender"`
|
||||
CommitID string `json:"commit_id"`
|
||||
Review *ReviewPayload `json:"review"`
|
||||
Label *Label `json:"label,omitempty"`
|
||||
}
|
||||
|
||||
// JSONPayload FIXME
|
||||
|
|
3
release-notes/5778.md
Normal file
3
release-notes/5778.md
Normal file
|
@ -0,0 +1,3 @@
|
|||
fix: In a Forgejo Actions workflow, the `unlabeled` event type for pull requests was incorrectly mapped to the labeled event type.
|
||||
fix: When a Forgejo Actions issue or pull request workflow is triggered by an `labeled` or `unlabeled` event type, it misses information about the label added or removed. It is now available in the `label` data member of the event payload.
|
||||
fix: The pull request workflow must always update the head SHA commit status. Not just when the PR is synchronized, opened or closed. Otherwise it makes it impossible to define a job to be a required check (for instance a job that is triggered when labels are modified and verifies that a given combination is present).
|
|
@ -53,7 +53,7 @@ func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er
|
|||
return fmt.Errorf("head commit is missing in event payload")
|
||||
}
|
||||
sha = payload.HeadCommit.ID
|
||||
case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync:
|
||||
case webhook_module.HookEventPullRequest, webhook_module.HookEventPullRequestSync, webhook_module.HookEventPullRequestLabel, webhook_module.HookEventPullRequestAssign, webhook_module.HookEventPullRequestMilestone:
|
||||
if run.TriggerEvent == actions_module.GithubEventPullRequestTarget {
|
||||
event = "pull_request_target"
|
||||
} else {
|
||||
|
|
|
@ -168,7 +168,7 @@ func (n *actionsNotifier) IssueChangeAssignee(ctx context.Context, doer *user_mo
|
|||
hookEvent = webhook_module.HookEventPullRequestAssign
|
||||
}
|
||||
|
||||
notifyIssueChange(ctx, doer, issue, hookEvent, action)
|
||||
notifyIssueChange(ctx, doer, issue, hookEvent, action, nil)
|
||||
}
|
||||
|
||||
// IssueChangeMilestone notifies assignee to notifiers
|
||||
|
@ -187,11 +187,11 @@ func (n *actionsNotifier) IssueChangeMilestone(ctx context.Context, doer *user_m
|
|||
hookEvent = webhook_module.HookEventPullRequestMilestone
|
||||
}
|
||||
|
||||
notifyIssueChange(ctx, doer, issue, hookEvent, action)
|
||||
notifyIssueChange(ctx, doer, issue, hookEvent, action, nil)
|
||||
}
|
||||
|
||||
func (n *actionsNotifier) IssueChangeLabels(ctx context.Context, doer *user_model.User, issue *issues_model.Issue,
|
||||
_, _ []*issues_model.Label,
|
||||
addedLabels, removedLabels []*issues_model.Label,
|
||||
) {
|
||||
ctx = withMethod(ctx, "IssueChangeLabels")
|
||||
|
||||
|
@ -200,10 +200,15 @@ func (n *actionsNotifier) IssueChangeLabels(ctx context.Context, doer *user_mode
|
|||
hookEvent = webhook_module.HookEventPullRequestLabel
|
||||
}
|
||||
|
||||
notifyIssueChange(ctx, doer, issue, hookEvent, api.HookIssueLabelUpdated)
|
||||
for _, added := range addedLabels {
|
||||
notifyIssueChange(ctx, doer, issue, hookEvent, api.HookIssueLabelUpdated, added)
|
||||
}
|
||||
for _, removed := range removedLabels {
|
||||
notifyIssueChange(ctx, doer, issue, hookEvent, api.HookIssueLabelCleared, removed)
|
||||
}
|
||||
}
|
||||
|
||||
func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, event webhook_module.HookEventType, action api.HookIssueAction) {
|
||||
func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, event webhook_module.HookEventType, action api.HookIssueAction, label *issues_model.Label) {
|
||||
var err error
|
||||
if err = issue.LoadRepo(ctx); err != nil {
|
||||
log.Error("LoadRepo: %v", err)
|
||||
|
@ -215,6 +220,11 @@ func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues
|
|||
return
|
||||
}
|
||||
|
||||
var apiLabel *api.Label
|
||||
if action == api.HookIssueLabelUpdated || action == api.HookIssueLabelCleared {
|
||||
apiLabel = convert.ToLabel(label, issue.Repo, nil)
|
||||
}
|
||||
|
||||
if issue.IsPull {
|
||||
if err = issue.LoadPullRequest(ctx); err != nil {
|
||||
log.Error("loadPullRequest: %v", err)
|
||||
|
@ -228,6 +238,7 @@ func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues
|
|||
PullRequest: convert.ToAPIPullRequest(ctx, issue.PullRequest, nil),
|
||||
Repository: convert.ToRepo(ctx, issue.Repo, access_model.Permission{AccessMode: perm_model.AccessModeNone}),
|
||||
Sender: convert.ToUser(ctx, doer, nil),
|
||||
Label: apiLabel,
|
||||
}).
|
||||
WithPullRequest(issue.PullRequest).
|
||||
Notify(ctx)
|
||||
|
@ -242,6 +253,7 @@ func notifyIssueChange(ctx context.Context, doer *user_model.User, issue *issues
|
|||
Issue: convert.ToAPIIssue(ctx, doer, issue),
|
||||
Repository: convert.ToRepo(ctx, issue.Repo, permission),
|
||||
Sender: convert.ToUser(ctx, doer, nil),
|
||||
Label: apiLabel,
|
||||
}).
|
||||
Notify(ctx)
|
||||
}
|
||||
|
|
|
@ -5,12 +5,14 @@ package integration
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
actions_model "code.gitea.io/gitea/models/actions"
|
||||
auth_model "code.gitea.io/gitea/models/auth"
|
||||
"code.gitea.io/gitea/models/db"
|
||||
git_model "code.gitea.io/gitea/models/git"
|
||||
issues_model "code.gitea.io/gitea/models/issues"
|
||||
|
@ -22,9 +24,11 @@ import (
|
|||
"code.gitea.io/gitea/modules/git"
|
||||
"code.gitea.io/gitea/modules/gitrepo"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
api "code.gitea.io/gitea/modules/structs"
|
||||
"code.gitea.io/gitea/modules/test"
|
||||
webhook_module "code.gitea.io/gitea/modules/webhook"
|
||||
actions_service "code.gitea.io/gitea/services/actions"
|
||||
issue_service "code.gitea.io/gitea/services/issue"
|
||||
pull_service "code.gitea.io/gitea/services/pull"
|
||||
release_service "code.gitea.io/gitea/services/release"
|
||||
repo_service "code.gitea.io/gitea/services/repository"
|
||||
|
@ -35,6 +39,314 @@ import (
|
|||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestPullRequestCommitStatus(t *testing.T) {
|
||||
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo
|
||||
session := loginUser(t, "user2")
|
||||
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue)
|
||||
|
||||
// prepare the repository
|
||||
files := make([]*files_service.ChangeRepoFile, 0, 10)
|
||||
for _, onType := range []string{
|
||||
"opened",
|
||||
"synchronize",
|
||||
"labeled",
|
||||
"unlabeled",
|
||||
"assigned",
|
||||
"unassigned",
|
||||
"milestoned",
|
||||
"demilestoned",
|
||||
"closed",
|
||||
"reopened",
|
||||
} {
|
||||
files = append(files, &files_service.ChangeRepoFile{
|
||||
Operation: "create",
|
||||
TreePath: fmt.Sprintf(".forgejo/workflows/%s.yml", onType),
|
||||
ContentReader: strings.NewReader(fmt.Sprintf(`name: %[1]s
|
||||
on:
|
||||
pull_request:
|
||||
types:
|
||||
- %[1]s
|
||||
jobs:
|
||||
%[1]s:
|
||||
runs-on: docker
|
||||
steps:
|
||||
- run: true
|
||||
`, onType)),
|
||||
})
|
||||
}
|
||||
baseRepo, _, f := tests.CreateDeclarativeRepo(t, user2, "repo-pull-request",
|
||||
[]unit_model.Type{unit_model.TypeActions}, nil, files)
|
||||
defer f()
|
||||
baseGitRepo, err := gitrepo.OpenRepository(db.DefaultContext, baseRepo)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
baseGitRepo.Close()
|
||||
}()
|
||||
|
||||
// prepare the repository labels
|
||||
labelStr := "/api/v1/repos/user2/repo-pull-request/labels"
|
||||
labelsCount := 2
|
||||
labels := make([]*api.Label, labelsCount)
|
||||
for i := 0; i < labelsCount; i++ {
|
||||
color := "abcdef"
|
||||
req := NewRequestWithJSON(t, "POST", labelStr, &api.CreateLabelOption{
|
||||
Name: fmt.Sprintf("label%d", i),
|
||||
Color: color,
|
||||
}).AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, http.StatusCreated)
|
||||
labels[i] = new(api.Label)
|
||||
DecodeJSON(t, resp, &labels[i])
|
||||
assert.Equal(t, color, labels[i].Color)
|
||||
}
|
||||
|
||||
// create the pull request
|
||||
testEditFileToNewBranch(t, session, "user2", "repo-pull-request", "main", "wip-something", "README.md", "Hello, world 1")
|
||||
testPullCreate(t, session, "user2", "repo-pull-request", true, "main", "wip-something", "Commit status PR")
|
||||
pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: baseRepo.ID})
|
||||
require.NoError(t, pr.LoadIssue(db.DefaultContext))
|
||||
|
||||
// prepare the assignees
|
||||
issueURL := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%s", "user2", "repo-pull-request", fmt.Sprintf("%d", pr.Issue.Index))
|
||||
|
||||
// prepare the labels
|
||||
labelURL := fmt.Sprintf("%s/labels", issueURL)
|
||||
|
||||
// prepare the milestone
|
||||
milestoneStr := "/api/v1/repos/user2/repo-pull-request/milestones"
|
||||
req := NewRequestWithJSON(t, "POST", milestoneStr, &api.CreateMilestoneOption{
|
||||
Title: "mymilestone",
|
||||
State: "open",
|
||||
}).AddTokenAuth(token)
|
||||
resp := MakeRequest(t, req, http.StatusCreated)
|
||||
milestone := new(api.Milestone)
|
||||
DecodeJSON(t, resp, &milestone)
|
||||
|
||||
// check that one of the status associated with the commit sha matches both
|
||||
// context & state
|
||||
checkCommitStatus := func(sha, context string, state api.CommitStatusState) bool {
|
||||
commitStatuses, _, err := git_model.GetLatestCommitStatus(db.DefaultContext, pr.BaseRepoID, sha, db.ListOptionsAll)
|
||||
require.NoError(t, err)
|
||||
for _, commitStatus := range commitStatuses {
|
||||
if state == commitStatus.State && context == commitStatus.Context {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
assertActionRun := func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRun *actions_model.ActionRun) {
|
||||
assert.Equal(t, fmt.Sprintf("%s.yml", onType), actionRun.WorkflowID)
|
||||
assert.Equal(t, sha, actionRun.CommitSHA)
|
||||
assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent)
|
||||
event, err := actionRun.GetPullRequestEventPayload()
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, action, event.Action)
|
||||
}
|
||||
|
||||
type assertType func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun)
|
||||
assertActionRuns := func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) {
|
||||
require.Len(t, actionRuns, 1)
|
||||
assertActionRun(t, sha, onType, action, actionRuns[0])
|
||||
}
|
||||
|
||||
for _, testCase := range []struct {
|
||||
onType string
|
||||
jobID string
|
||||
doSomething func()
|
||||
actionRunCount int
|
||||
action api.HookIssueAction
|
||||
assert assertType
|
||||
}{
|
||||
{
|
||||
onType: "opened",
|
||||
doSomething: func() {},
|
||||
actionRunCount: 1,
|
||||
action: api.HookIssueOpened,
|
||||
assert: assertActionRuns,
|
||||
},
|
||||
{
|
||||
onType: "synchronize",
|
||||
doSomething: func() {
|
||||
testEditFile(t, session, "user2", "repo-pull-request", "wip-something", "README.md", "Hello, world 2")
|
||||
},
|
||||
actionRunCount: 1,
|
||||
action: api.HookIssueSynchronized,
|
||||
assert: assertActionRuns,
|
||||
},
|
||||
{
|
||||
onType: "labeled",
|
||||
doSomething: func() {
|
||||
req := NewRequestWithJSON(t, "POST", labelURL, &api.IssueLabelsOption{
|
||||
Labels: []any{labels[0].ID, labels[1].ID},
|
||||
}).AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
},
|
||||
actionRunCount: 2,
|
||||
action: api.HookIssueLabelUpdated,
|
||||
assert: func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) {
|
||||
assertActionRun(t, sha, onType, api.HookIssueLabelUpdated, actionRuns[0])
|
||||
assertActionRun(t, sha, onType, api.HookIssueLabelUpdated, actionRuns[1])
|
||||
},
|
||||
},
|
||||
{
|
||||
onType: "unlabeled",
|
||||
doSomething: func() {
|
||||
req := NewRequestWithJSON(t, "PUT", labelURL, &api.IssueLabelsOption{
|
||||
Labels: []any{labels[0].ID},
|
||||
}).AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusOK)
|
||||
},
|
||||
actionRunCount: 3,
|
||||
action: api.HookIssueLabelCleared,
|
||||
assert: func(t *testing.T, sha, onType string, action api.HookIssueAction, actionRuns []*actions_model.ActionRun) {
|
||||
foundPayloadWithLabels := false
|
||||
knownLabels := []string{"label0", "label1"}
|
||||
for _, actionRun := range actionRuns {
|
||||
assert.Equal(t, sha, actionRun.CommitSHA)
|
||||
assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent)
|
||||
event, err := actionRun.GetPullRequestEventPayload()
|
||||
require.NoError(t, err)
|
||||
switch event.Action {
|
||||
case api.HookIssueLabelUpdated:
|
||||
assert.Equal(t, "labeled.yml", actionRun.WorkflowID)
|
||||
assert.Equal(t, "label0", event.Label.Name)
|
||||
require.Len(t, event.PullRequest.Labels, 1)
|
||||
assert.Contains(t, "label0", event.PullRequest.Labels[0].Name)
|
||||
case api.HookIssueLabelCleared:
|
||||
assert.Equal(t, "unlabeled.yml", actionRun.WorkflowID)
|
||||
assert.Contains(t, knownLabels, event.Label.Name)
|
||||
if len(event.PullRequest.Labels) > 0 {
|
||||
foundPayloadWithLabels = true
|
||||
assert.Contains(t, knownLabels, event.PullRequest.Labels[0].Name)
|
||||
}
|
||||
default:
|
||||
require.Fail(t, fmt.Sprintf("unexpected action '%s'", event.Action))
|
||||
}
|
||||
}
|
||||
assert.True(t, foundPayloadWithLabels, "expected at least one clear label payload with non empty labels")
|
||||
},
|
||||
},
|
||||
{
|
||||
onType: "assigned",
|
||||
doSomething: func() {
|
||||
req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{
|
||||
Assignees: []string{"user2"},
|
||||
}).AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusCreated)
|
||||
},
|
||||
actionRunCount: 1,
|
||||
action: api.HookIssueAssigned,
|
||||
assert: assertActionRuns,
|
||||
},
|
||||
{
|
||||
onType: "unassigned",
|
||||
doSomething: func() {
|
||||
req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{
|
||||
Assignees: []string{},
|
||||
}).AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusCreated)
|
||||
},
|
||||
actionRunCount: 1,
|
||||
action: api.HookIssueUnassigned,
|
||||
assert: assertActionRuns,
|
||||
},
|
||||
{
|
||||
onType: "milestoned",
|
||||
doSomething: func() {
|
||||
req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{
|
||||
Milestone: &milestone.ID,
|
||||
}).AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusCreated)
|
||||
},
|
||||
actionRunCount: 1,
|
||||
action: api.HookIssueMilestoned,
|
||||
assert: assertActionRuns,
|
||||
},
|
||||
{
|
||||
onType: "demilestoned",
|
||||
doSomething: func() {
|
||||
var zero int64
|
||||
req := NewRequestWithJSON(t, "PATCH", issueURL, &api.EditIssueOption{
|
||||
Milestone: &zero,
|
||||
}).AddTokenAuth(token)
|
||||
MakeRequest(t, req, http.StatusCreated)
|
||||
},
|
||||
actionRunCount: 1,
|
||||
action: api.HookIssueDemilestoned,
|
||||
assert: assertActionRuns,
|
||||
},
|
||||
{
|
||||
onType: "closed",
|
||||
doSomething: func() {
|
||||
sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
|
||||
require.NoError(t, err)
|
||||
err = issue_service.ChangeStatus(db.DefaultContext, pr.Issue, user2, sha, true)
|
||||
require.NoError(t, err)
|
||||
},
|
||||
actionRunCount: 1,
|
||||
action: api.HookIssueClosed,
|
||||
assert: assertActionRuns,
|
||||
},
|
||||
{
|
||||
onType: "reopened",
|
||||
doSomething: func() {
|
||||
sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
|
||||
require.NoError(t, err)
|
||||
err = issue_service.ChangeStatus(db.DefaultContext, pr.Issue, user2, sha, false)
|
||||
require.NoError(t, err)
|
||||
},
|
||||
actionRunCount: 1,
|
||||
action: api.HookIssueReOpened,
|
||||
assert: assertActionRuns,
|
||||
},
|
||||
} {
|
||||
t.Run(testCase.onType, func(t *testing.T) {
|
||||
defer func() {
|
||||
// cleanup leftovers, start from scratch
|
||||
_, err = db.DeleteByBean(db.DefaultContext, actions_model.ActionRun{RepoID: baseRepo.ID})
|
||||
require.NoError(t, err)
|
||||
_, err = db.DeleteByBean(db.DefaultContext, actions_model.ActionRunJob{RepoID: baseRepo.ID})
|
||||
require.NoError(t, err)
|
||||
}()
|
||||
|
||||
// trigger the onType event
|
||||
testCase.doSomething()
|
||||
count := testCase.actionRunCount
|
||||
context := fmt.Sprintf("%[1]s / %[1]s (pull_request)", testCase.onType)
|
||||
|
||||
var actionRuns []*actions_model.ActionRun
|
||||
|
||||
// wait for ActionRun(s) to be created
|
||||
require.Eventually(t, func() bool {
|
||||
actionRuns = make([]*actions_model.ActionRun, 0)
|
||||
require.NoError(t, db.GetEngine(db.DefaultContext).Where("repo_id=?", baseRepo.ID).Find(&actionRuns))
|
||||
return assert.Len(t, actionRuns, count)
|
||||
}, 30*time.Second, 1*time.Second)
|
||||
|
||||
// verify the expected ActionRuns were created
|
||||
sha, err := baseGitRepo.GetRefCommitID(pr.GetGitRefName())
|
||||
require.NoError(t, err)
|
||||
// verify the commit status changes to CommitStatusSuccess when the job changes to StatusSuccess
|
||||
assert.True(t, checkCommitStatus(sha, context, api.CommitStatusPending))
|
||||
for _, actionRun := range actionRuns {
|
||||
// verify the expected ActionRunJob was created and is StatusWaiting
|
||||
job := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunJob{RunID: actionRun.ID, CommitSHA: sha})
|
||||
assert.Equal(t, actions_model.StatusWaiting, job.Status)
|
||||
|
||||
// change the state of the job to success
|
||||
job.Status = actions_model.StatusSuccess
|
||||
actions_service.CreateCommitStatus(db.DefaultContext, job)
|
||||
}
|
||||
// verify the commit status changed to CommitStatusSuccess because the job(s) changed to StatusSuccess
|
||||
assert.True(t, checkCommitStatus(sha, context, api.CommitStatusSuccess))
|
||||
|
||||
testCase.assert(t, sha, testCase.onType, testCase.action, actionRuns)
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestPullRequestTargetEvent(t *testing.T) {
|
||||
onGiteaRun(t, func(t *testing.T, u *url.URL) {
|
||||
user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) // owner of the base repo
|
||||
|
|
Loading…
Add table
Reference in a new issue