diff options
| author | 6543 <6543@obermui.de> | 2020-09-11 00:29:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 23:29:19 +0100 |
| commit | fd60ebfe14927657ff5cfa4e75f975eaadae65f1 (patch) | |
| tree | 38c3d70146920a13c228fed91bc1a55c9be72436 /integrations | |
| parent | daefdd1385d12bf0c8321f291dbb6ab242b41c99 (diff) | |
| download | gitea-fd60ebfe14927657ff5cfa4e75f975eaadae65f1.tar.gz gitea-fd60ebfe14927657ff5cfa4e75f975eaadae65f1.zip | |
[API] Migration: Change ServiceType String (#12672)
* use different structs for MigrateRepoOptions on UI and API
* Fix TokenAuth and rename UID to an understandable Name
* fix swagger doc
* simplify & mk redable
* R E F A C T O R:
migration has now internal 3 structs to store its options:
* the Options for WebUI: modules/auth/repo_form.go
* the Options for API: modules/structs/repo.go
* the option struct with after validation for internal prossessing: modules/migrations/base/options.go
* Copyright Header
* Deprecate UID - add RepoOwner
* adopt repo.go -> migrate.go
* add comment about each struct purpose
* lint
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/api_repo_test.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/integrations/api_repo_test.go b/integrations/api_repo_test.go index 9d3599102a..c8afa73ae6 100644 --- a/integrations/api_repo_test.go +++ b/integrations/api_repo_test.go @@ -316,10 +316,10 @@ func TestAPIRepoMigrate(t *testing.T) { user := models.AssertExistsAndLoadBean(t, &models.User{ID: testCase.ctxUserID}).(*models.User) session := loginUser(t, user.Name) token := getTokenForLoggedInUser(t, session) - req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate?token="+token, &api.MigrateRepoOption{ - CloneAddr: testCase.cloneURL, - UID: int(testCase.userID), - RepoName: testCase.repoName, + req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate?token="+token, &api.MigrateRepoOptions{ + CloneAddr: testCase.cloneURL, + RepoOwnerID: testCase.userID, + RepoName: testCase.repoName, }) resp := MakeRequest(t, req, NoExpectedStatus) if resp.Code == http.StatusUnprocessableEntity { @@ -360,10 +360,10 @@ func testAPIRepoMigrateConflict(t *testing.T, u *url.URL) { cloneURL := "https://github.com/go-gitea/test_repo.git" req := NewRequestWithJSON(t, "POST", "/api/v1/repos/migrate?token="+httpContext.Token, - &api.MigrateRepoOption{ - CloneAddr: cloneURL, - UID: int(userID), - RepoName: httpContext.Reponame, + &api.MigrateRepoOptions{ + CloneAddr: cloneURL, + RepoOwnerID: userID, + RepoName: httpContext.Reponame, }) resp := httpContext.Session.MakeRequest(t, req, http.StatusConflict) respJSON := map[string]string{} |