Git/gitea-tea
1
0
Fork 0
mirror of https://gitea.com/gitea/tea.git synced 2026-06-05 18:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move sdk from code.gitea.io/sdk/gitea to gitea.dev/sdk (#1006)

Browse Source 
Reviewed-on: https://gitea.com/gitea/tea/pulls/1006
Reviewed-by: Zettat123 <39446+zettat123@noreply.gitea.com>
This commit is contained in:
Lunny Xiao
2026-05-26 04:51:09 +00:00
parent 579099f9d9
commit 28ba9b915b
179 changed files with 617 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/admin_users_test.go
+8 -9
View File
@@ -4,14 +4,13 @@
package integration
import (
"context"
"fmt"
"os"
"path/filepath"
"testing"
"time"
"code.gitea.io/sdk/gitea"
gitea "gitea.dev/sdk"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -22,14 +21,14 @@ func runAdminCommand(t *testing.T, args []string) error {
t.Helper()
adminCmd := teacmd.CmdAdmin
return adminCmd.Run(context.Background(), args)
return adminCmd.Run(t.Context(), args)
}
func createAdminTestUser(t *testing.T, client *gitea.Client, username, password string) {
t.Helper()
mustChangePassword := false
user, _, err := client.AdminCreateUser(gitea.CreateUserOption{
user, _, err := client.Admin.CreateUser(t.Context(), gitea.CreateUserOption{
LoginName: username,
Username: username,
Email: username + "@example.com",
@@ -40,7 +39,7 @@ func createAdminTestUser(t *testing.T, client *gitea.Client, username, password
require.Equal(t, username, user.UserName)
t.Cleanup(func() {
if _, err := client.AdminDeleteUser(username); err != nil {
if _, err := client.Admin.DeleteUser(t.Context(), username); err != nil {
t.Logf("failed to delete integration test user %q: %v", username, err)
}
})
@@ -76,7 +75,7 @@ func TestAdminUsersCreateAndDelete(t *testing.T) {
})
require.NoError(t, err)
createdUser, _, err := client.GetUserInfo(username)
createdUser, _, err := client.Users.GetUserInfo(t.Context(), username)
require.NoError(t, err)
assert.Equal(t, username, createdUser.UserName)
assert.Equal(t, username+"@example.com", createdUser.Email)
@@ -91,7 +90,7 @@ func TestAdminUsersCreateAndDelete(t *testing.T) {
})
require.NoError(t, err)
_, _, err = client.GetUserInfo(username)
_, _, err = client.Users.GetUserInfo(t.Context(), username)
require.Error(t, err)
}
@@ -118,7 +117,7 @@ func TestAdminUsersEdit(t *testing.T) {
})
require.NoError(t, err)
updatedUser, _, err := client.GetUserInfo(username)
updatedUser, _, err := client.Users.GetUserInfo(t.Context(), username)
require.NoError(t, err)
assert.Equal(t, username+"+new@example.com", updatedUser.Email)
assert.Equal(t, "Tea Integration", updatedUser.FullName)
@@ -134,7 +133,7 @@ func TestAdminUsersEdit(t *testing.T) {
)
require.NoError(t, err)
me, _, err := passwordClient.GetMyUserInfo()
me, _, err := passwordClient.Users.GetMyUserInfo(t.Context())
require.NoError(t, err)
assert.Equal(t, username, me.UserName)
}
tests/integration/helpers_test.go
+5 -4
View File
@@ -4,13 +4,14 @@
package integration
import (
stdctx "context"
"fmt"
"os"
"path/filepath"
"testing"
"time"
"code.gitea.io/sdk/gitea"
gitea "gitea.dev/sdk"
"github.com/stretchr/testify/require"
"gitea.dev/tea/modules/config"
@@ -44,7 +45,7 @@ func TestMain(m *testing.M) {
if integrationSetupErr == nil {
tokenName := fmt.Sprintf("tea-integration-%d", time.Now().UnixNano())
var token *gitea.AccessToken
token, _, integrationSetupErr = integrationClient.CreateAccessToken(gitea.CreateAccessTokenOption{
token, _, integrationSetupErr = integrationClient.Users.CreateAccessToken(stdctx.Background(), gitea.CreateAccessTokenOption{
Name: tokenName,
Scopes: []gitea.AccessTokenScope{gitea.AccessTokenScopeAll},
})
@@ -59,7 +60,7 @@ func TestMain(m *testing.M) {
exitCode := m.Run()
if integrationClient != nil && integrationTokenID != 0 {
if _, err := integrationClient.DeleteAccessToken(integrationTokenID); err != nil {
if _, err := integrationClient.Users.DeleteAccessToken(stdctx.Background(), integrationTokenID); err != nil {
fmt.Fprintf(os.Stderr, "failed to delete integration token %d: %v\n", integrationTokenID, err)
if exitCode == 0 {
exitCode = 1
@@ -95,7 +96,7 @@ func createIntegrationLogin(t *testing.T) *config.Login {
require.NotEmpty(t, integrationToken, "integration token setup failed")
require.NoError(t, task.CreateLogin("integration", integrationToken, "", "", "", "", "", integrationGiteaURL, "", "", true, false, false, false))
require.NoError(t, task.CreateLogin(t.Context(), "integration", integrationToken, "", "", "", "", "", integrationGiteaURL, "", "", true, false, false, false))
login, err := config.GetLoginByName("integration")
require.NoError(t, err)
tests/integration/repos_create_test.go
+3 -4
View File
@@ -4,12 +4,11 @@
package integration
import (
"context"
"fmt"
"testing"
"time"
"code.gitea.io/sdk/gitea"
gitea "gitea.dev/sdk"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v3"
@@ -65,7 +64,7 @@ func TestCreateRepoObjectFormat(t *testing.T) {
args := append([]string{"repos", "create"}, tt.args...)
args = append(args, "--login", login.Name)
err := reposCmd.Run(context.Background(), args)
err := reposCmd.Run(t.Context(), args)
if tt.wantErr {
assert.Error(t, err)
if tt.errContains != "" {
@@ -76,7 +75,7 @@ func TestCreateRepoObjectFormat(t *testing.T) {
require.NoError(t, err)
t.Cleanup(func() {
if _, delErr := client.DeleteRepo(login.User, tt.wantOpts.Name); delErr != nil {
if _, delErr := client.Repositories.DeleteRepo(t.Context(), login.User, tt.wantOpts.Name); delErr != nil {
t.Logf("failed to delete integration test repo %q: %v", tt.wantOpts.Name, delErr)
}
})
tests/integration/sshkeys_test.go
+7 -8
View File
@@ -4,7 +4,6 @@
package integration
import (
"context"
"crypto/ed25519"
"crypto/rand"
"encoding/base64"
@@ -14,7 +13,7 @@ import (
"testing"
"time"
"code.gitea.io/sdk/gitea"
gitea "gitea.dev/sdk"
sshkeyscmd "gitea.dev/tea/cmd/sshkeys"
@@ -65,14 +64,14 @@ func TestSSHKeyAddAndDelete(t *testing.T) {
cmd := sshKeysCmd()
client := login.Client()
err := cmd.Run(context.Background(), []string{
err := cmd.Run(t.Context(), []string{
"ssh-keys", "add", pubKeyFile,
"--title", keyTitle,
"--login", login.Name,
})
require.NoError(t, err)
keys, _, err := client.ListMyPublicKeys(gitea.ListPublicKeysOptions{
keys, _, err := client.Users.ListMyPublicKeys(t.Context(), gitea.ListPublicKeysOptions{
ListOptions: gitea.ListOptions{Page: -1},
})
require.NoError(t, err)
@@ -87,17 +86,17 @@ func TestSSHKeyAddAndDelete(t *testing.T) {
require.NotNil(t, addedKey, "added key not found in key list")
t.Cleanup(func() {
client.DeletePublicKey(addedKey.ID) //nolint:errcheck
client.Users.DeletePublicKey(t.Context(), addedKey.ID) //nolint:errcheck
})
err = cmd.Run(context.Background(), []string{
err = cmd.Run(t.Context(), []string{
"ssh-keys", "delete", strconv.FormatInt(addedKey.ID, 10),
"--confirm",
"--login", login.Name,
})
assert.NoError(t, err)
_, resp, err := client.GetPublicKey(addedKey.ID)
_, resp, err := client.Users.GetPublicKey(t.Context(), addedKey.ID)
assert.Error(t, err)
if assert.NotNil(t, resp) {
assert.Equal(t, 404, resp.StatusCode)
@@ -108,7 +107,7 @@ func TestSSHKeyList(t *testing.T) {
login := createIntegrationLogin(t)
cmd := sshKeysCmd()
err := cmd.Run(context.Background(), []string{
err := cmd.Run(t.Context(), []string{
"ssh-keys", "list",
"--login", login.Name,
})