diff options
| author |  Daenney <git@noreply.sourcery.dny.nu> | 2025-05-22 12:26:11 +0200 |
|---|---|---|
| committer |  kim <gruf@noreply.codeberg.org> | 2025-05-22 12:26:11 +0200 |
| commit | d5c9c4adc167cdb05e73f5105702cf340293e61c (patch) | |
| tree | 1d21fe376099864900837eba675a965517f98e5d /internal/api/auth | |
| parent | [feature] Allow exposing allows, implement `/api/v1/domain_blocks` and `/api/... (diff) | |
| download | gotosocial-d5c9c4adc167cdb05e73f5105702cf340293e61c.tar.xz | |
[chore] Upgrade to Go 1.24 (#4187)
* Set `go.mod` to 1.24 now that it's been out for 3 months.
* Update all the test to use `testing.T.Context()`.
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4187
Co-authored-by: Daenney <git@noreply.sourcery.dny.nu>
Co-committed-by: Daenney <git@noreply.sourcery.dny.nu>
Diffstat (limited to 'internal/api/auth')
| -rw-r--r-- | internal/api/auth/authorize_test.go | 5 | ||||
| -rw-r--r-- | internal/api/auth/revoke_test.go | 7 | ||||
| -rw-r--r-- | internal/api/auth/token_test.go | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/internal/api/auth/authorize_test.go b/internal/api/auth/authorize_test.go index b73f5e0e1..56a05416b 100644 --- a/internal/api/auth/authorize_test.go +++ b/internal/api/auth/authorize_test.go @@ -1,7 +1,6 @@ package auth_test import ( - "context" "fmt" "net/http" "testing" @@ -93,9 +92,9 @@ func (suite *AuthAuthorizeTestSuite) TestAccountAuthorizeHandler() { testCase.description = fmt.Sprintf("%s, %t, %s", user.Email, *user.Disabled, account.SuspendedAt) - err := suite.db.UpdateUser(context.Background(), user, columns...) + err := suite.db.UpdateUser(suite.T().Context(), user, columns...) suite.NoError(err) - err = suite.db.UpdateAccount(context.Background(), account) + err = suite.db.UpdateAccount(suite.T().Context(), account) suite.NoError(err) // call the handler diff --git a/internal/api/auth/revoke_test.go b/internal/api/auth/revoke_test.go index e482c8aac..3af573411 100644 --- a/internal/api/auth/revoke_test.go +++ b/internal/api/auth/revoke_test.go @@ -19,7 +19,6 @@ package auth_test import ( "bytes" - "context" "encoding/json" "io" "net/http" @@ -71,7 +70,7 @@ func (suite *RevokeTestSuite) TestRevokeOK() { // Ensure token now gone. _, err = suite.state.DB.GetTokenByAccess( - context.Background(), + suite.T().Context(), token.Access, ) suite.ErrorIs(err, db.ErrNoEntries) @@ -130,7 +129,7 @@ func (suite *RevokeTestSuite) TestRevokeWrongSecret() { // Ensure token still there. _, err = suite.state.DB.GetTokenByAccess( - context.Background(), + suite.T().Context(), token.Access, ) suite.NoError(err) @@ -188,7 +187,7 @@ func (suite *RevokeTestSuite) TestRevokeNoClientID() { // Ensure token still there. _, err = suite.state.DB.GetTokenByAccess( - context.Background(), + suite.T().Context(), token.Access, ) suite.NoError(err) diff --git a/internal/api/auth/token_test.go b/internal/api/auth/token_test.go index e333a8867..5d1aa4df5 100644 --- a/internal/api/auth/token_test.go +++ b/internal/api/auth/token_test.go @@ -18,7 +18,6 @@ package auth_test import ( - "context" "encoding/json" "io" "net/http" @@ -93,7 +92,7 @@ func (suite *TokenTestSuite) TestRetrieveClientCredentialsOK() { // there should be a token in the database now too dbToken := >smodel.Token{} - err = suite.db.GetWhere(context.Background(), []db.Where{{Key: "access", Value: t.AccessToken}}, dbToken) + err = suite.db.GetWhere(suite.T().Context(), []db.Where{{Key: "access", Value: t.AccessToken}}, dbToken) suite.NoError(err) suite.NotNil(dbToken) } @@ -204,7 +203,7 @@ func (suite *TokenTestSuite) TestRetrieveAuthorizationCodeOK() { suite.WithinDuration(time.Now(), time.Unix(t.CreatedAt, 0), 1*time.Minute) dbToken := >smodel.Token{} - err = suite.db.GetWhere(context.Background(), []db.Where{{Key: "access", Value: t.AccessToken}}, dbToken) + err = suite.db.GetWhere(suite.T().Context(), []db.Where{{Key: "access", Value: t.AccessToken}}, dbToken) suite.NoError(err) suite.NotNil(dbToken) } |