summaryrefslogtreecommitdiff
path: root/internal/processing/user
diff options
context:
space:
mode:
authorLibravatar Daenney <git@noreply.sourcery.dny.nu>2025-05-22 12:26:11 +0200
committerLibravatar kim <gruf@noreply.codeberg.org>2025-05-22 12:26:11 +0200
commitd5c9c4adc167cdb05e73f5105702cf340293e61c (patch)
tree1d21fe376099864900837eba675a965517f98e5d /internal/processing/user
parent[feature] Allow exposing allows, implement `/api/v1/domain_blocks` and `/api/... (diff)
downloadgotosocial-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/processing/user')
-rw-r--r--internal/processing/user/create_test.go3
-rw-r--r--internal/processing/user/email_test.go5
-rw-r--r--internal/processing/user/password_test.go13
3 files changed, 9 insertions, 12 deletions
diff --git a/internal/processing/user/create_test.go b/internal/processing/user/create_test.go
index d193ab883..9babbdfd5 100644
--- a/internal/processing/user/create_test.go
+++ b/internal/processing/user/create_test.go
@@ -18,7 +18,6 @@
package user_test
import (
- "context"
"net"
"testing"
@@ -32,7 +31,7 @@ type CreateTestSuite struct {
func (suite *CreateTestSuite) TestCreateOK() {
var (
- ctx = context.Background()
+ ctx = suite.T().Context()
app = suite.testApps["application_1"]
appToken = suite.testTokens["local_account_1_client_application_token"]
form = &apimodel.AccountCreateRequest{
diff --git a/internal/processing/user/email_test.go b/internal/processing/user/email_test.go
index 23d448a84..e68fe21d5 100644
--- a/internal/processing/user/email_test.go
+++ b/internal/processing/user/email_test.go
@@ -18,7 +18,6 @@
package user_test
import (
- "context"
"testing"
"time"
@@ -30,7 +29,7 @@ type EmailConfirmTestSuite struct {
}
func (suite *EmailConfirmTestSuite) TestConfirmEmail() {
- ctx := context.Background()
+ ctx := suite.T().Context()
user := suite.testUsers["local_account_1"]
@@ -58,7 +57,7 @@ func (suite *EmailConfirmTestSuite) TestConfirmEmail() {
}
func (suite *EmailConfirmTestSuite) TestConfirmEmailOldToken() {
- ctx := context.Background()
+ ctx := suite.T().Context()
user := suite.testUsers["local_account_1"]
diff --git a/internal/processing/user/password_test.go b/internal/processing/user/password_test.go
index 5f65a9e1a..dfe249058 100644
--- a/internal/processing/user/password_test.go
+++ b/internal/processing/user/password_test.go
@@ -18,7 +18,6 @@
package user_test
import (
- "context"
"net/http"
"testing"
@@ -35,7 +34,7 @@ type ChangePasswordTestSuite struct {
func (suite *ChangePasswordTestSuite) TestChangePasswordOK() {
user := suite.testUsers["local_account_1"]
- errWithCode := suite.user.PasswordChange(context.Background(), user, "password", "verygoodnewpassword")
+ errWithCode := suite.user.PasswordChange(suite.T().Context(), user, "password", "verygoodnewpassword")
suite.NoError(errWithCode)
err := bcrypt.CompareHashAndPassword(
@@ -46,7 +45,7 @@ func (suite *ChangePasswordTestSuite) TestChangePasswordOK() {
// get user from the db again
dbUser := &gtsmodel.User{}
- err = suite.db.GetByID(context.Background(), user.ID, dbUser)
+ err = suite.db.GetByID(suite.T().Context(), user.ID, dbUser)
suite.NoError(err)
// check the password has changed
@@ -60,14 +59,14 @@ func (suite *ChangePasswordTestSuite) TestChangePasswordOK() {
func (suite *ChangePasswordTestSuite) TestChangePasswordIncorrectOld() {
user := suite.testUsers["local_account_1"]
- errWithCode := suite.user.PasswordChange(context.Background(), user, "ooooopsydoooopsy", "verygoodnewpassword")
+ errWithCode := suite.user.PasswordChange(suite.T().Context(), user, "ooooopsydoooopsy", "verygoodnewpassword")
suite.EqualError(errWithCode, "PasswordChange: crypto/bcrypt: hashedPassword is not the hash of the given password")
suite.Equal(http.StatusUnauthorized, errWithCode.Code())
suite.Equal("Unauthorized: old password was incorrect", errWithCode.Safe())
// get user from the db again
dbUser := &gtsmodel.User{}
- err := suite.db.GetByID(context.Background(), user.ID, dbUser)
+ err := suite.db.GetByID(suite.T().Context(), user.ID, dbUser)
suite.NoError(err)
// check the password has not changed
@@ -81,14 +80,14 @@ func (suite *ChangePasswordTestSuite) TestChangePasswordIncorrectOld() {
func (suite *ChangePasswordTestSuite) TestChangePasswordWeakNew() {
user := suite.testUsers["local_account_1"]
- errWithCode := suite.user.PasswordChange(context.Background(), user, "password", "1234")
+ errWithCode := suite.user.PasswordChange(suite.T().Context(), user, "password", "1234")
suite.EqualError(errWithCode, "password is only 11% strength, try including more special characters, using lowercase letters, using uppercase letters or using a longer password")
suite.Equal(http.StatusBadRequest, errWithCode.Code())
suite.Equal("Bad Request: password is only 11% strength, try including more special characters, using lowercase letters, using uppercase letters or using a longer password", errWithCode.Safe())
// get user from the db again
dbUser := &gtsmodel.User{}
- err := suite.db.GetByID(context.Background(), user.ID, dbUser)
+ err := suite.db.GetByID(suite.T().Context(), user.ID, dbUser)
suite.NoError(err)
// check the password has not changed