diff options
| author | zeripath <art27@cantab.net> | 2021-04-06 20:44:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 20:44:05 +0100 |
| commit | fa3895ce81ba64689fbf76b91d96963541547881 (patch) | |
| tree | d7fe6c24429ccbb1d55b53441cefb34799dee993 /integrations/api_pull_test.go | |
| parent | 8be2cc4fc72e7985640dabdddb06cf78169c1882 (diff) | |
| download | gitea-fa3895ce81ba64689fbf76b91d96963541547881.tar.gz gitea-fa3895ce81ba64689fbf76b91d96963541547881.zip | |
Move modules/forms to services/forms (#15305)
Forms are dependent on models and therefore should be in services.
This PR also removes the old auth. aliasing
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'integrations/api_pull_test.go')
| -rw-r--r-- | integrations/api_pull_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/integrations/api_pull_test.go b/integrations/api_pull_test.go index 7aa0bfc54c..e6a4aca153 100644 --- a/integrations/api_pull_test.go +++ b/integrations/api_pull_test.go @@ -10,9 +10,9 @@ import ( "testing" "code.gitea.io/gitea/models" - auth "code.gitea.io/gitea/modules/forms" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/services/forms" issue_service "code.gitea.io/gitea/services/issue" "github.com/stretchr/testify/assert" @@ -50,7 +50,7 @@ func TestAPIMergePullWIP(t *testing.T) { session := loginUser(t, owner.Name) token := getTokenForLoggedInUser(t, session) - req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", owner.Name, repo.Name, pr.Index, token), &auth.MergePullRequestForm{ + req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s", owner.Name, repo.Name, pr.Index, token), &forms.MergePullRequestForm{ MergeMessageField: pr.Issue.Title, Do: string(models.MergeStyleMerge), }) |