tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request 'Use PostFormValue instead of PostForm.Get' (#3563) from algernon/forgejo:s/Req.PostForm.Get/Req.PostFormValue/g into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3563
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-05-02 15:48:28 +00:00
commit 9bc866124b
2 changed files with 89 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
routers/web/repo/issue_dependency.go
View file

@ -109,7 +109,7 @@ func RemoveDependency(ctx *context.Context) {
}
// Dependency Type
depTypeStr := ctx.Req.PostForm.Get("dependencyType")
depTypeStr := ctx.Req.PostFormValue("dependencyType")
var depType issues_model.DependencyType

88
tests/integration/issue_test.go
View file

@ -15,6 +15,7 @@ import (
"testing"
"time"
auth_model "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
issues_model "code.gitea.io/gitea/models/issues"
repo_model "code.gitea.io/gitea/models/repo"
@ -194,6 +195,93 @@ func TestNewIssue(t *testing.T) {
testNewIssue(t, session, "user2", "repo1", "Title", "Description")
}
func TestIssueDependencies(t *testing.T) {
defer tests.PrepareTestEnv(t)()
owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
session := loginUser(t, owner.Name)
token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue)
repo, _, f := CreateDeclarativeRepoWithOptions(t, owner, DeclarativeRepoOptions{})
defer f()
createIssue := func(t *testing.T, title string) api.Issue {
t.Helper()
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues", owner.Name, repo.Name)
req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateIssueOption{
Body: "",
Title: title,
}).AddTokenAuth(token)
resp := MakeRequest(t, req, http.StatusCreated)
var apiIssue api.Issue
DecodeJSON(t, resp, &apiIssue)
return apiIssue
}
addDependency := func(t *testing.T, issue, dependency api.Issue) {
t.Helper()
urlStr := fmt.Sprintf("/%s/%s/issues/%d/dependency/add", owner.Name, repo.Name, issue.Index)
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
"_csrf": GetCSRF(t, session, fmt.Sprintf("/%s/%s/issues/%d", owner.Name, repo.Name, issue.Index)),
"newDependency": fmt.Sprintf("%d", dependency.Index),
})
session.MakeRequest(t, req, http.StatusSeeOther)
}
removeDependency := func(t *testing.T, issue, dependency api.Issue) {
t.Helper()
urlStr := fmt.Sprintf("/%s/%s/issues/%d/dependency/delete", owner.Name, repo.Name, issue.Index)
req := NewRequestWithValues(t, "POST", urlStr, map[string]string{
"_csrf": GetCSRF(t, session, fmt.Sprintf("/%s/%s/issues/%d", owner.Name, repo.Name, issue.Index)),
"removeDependencyID": fmt.Sprintf("%d", dependency.Index),
"dependencyType": "blockedBy",
})
session.MakeRequest(t, req, http.StatusSeeOther)
}
assertHasDependency := func(t *testing.T, issueID, dependencyID int64, hasDependency bool) {
t.Helper()
urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/dependencies", owner.Name, repo.Name, issueID)
req := NewRequest(t, "GET", urlStr)
resp := MakeRequest(t, req, http.StatusOK)
var issues []api.Issue
DecodeJSON(t, resp, &issues)
if hasDependency {
assert.NotEmpty(t, issues)
assert.EqualValues(t, issues[0].Index, dependencyID)
} else {
assert.Empty(t, issues)
}
}
t.Run("Add dependency", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
issue1 := createIssue(t, "issue #1")
issue2 := createIssue(t, "issue #2")
addDependency(t, issue1, issue2)
assertHasDependency(t, issue1.Index, issue2.Index, true)
})
t.Run("Remove dependency", func(t *testing.T) {
defer tests.PrintCurrentTest(t)()
issue1 := createIssue(t, "issue #1")
issue2 := createIssue(t, "issue #2")
addDependency(t, issue1, issue2)
removeDependency(t, issue1, issue2)
assertHasDependency(t, issue1.Index, issue2.Index, false)
})
}
func TestIssueCommentClose(t *testing.T) {
defer tests.PrepareTestEnv(t)()
session := loginUser(t, "user2")