diff options
Diffstat (limited to 'internal/api/client/user')
| -rw-r--r-- | internal/api/client/user/user.go | 5 | ||||
| -rw-r--r-- | internal/api/client/user/user_test.go | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/internal/api/client/user/user.go b/internal/api/client/user/user.go index ff28a197f..89f71344b 100644 --- a/internal/api/client/user/user.go +++ b/internal/api/client/user/user.go @@ -22,7 +22,6 @@ import ( "net/http" "github.com/superseriousbusiness/gotosocial/internal/api" - "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/processing" "github.com/superseriousbusiness/gotosocial/internal/router" ) @@ -36,14 +35,12 @@ const ( // Module implements the ClientAPIModule interface type Module struct { - config *config.Config processor processing.Processor } // New returns a new user module -func New(config *config.Config, processor processing.Processor) api.ClientModule { +func New(processor processing.Processor) api.ClientModule { return &Module{ - config: config, processor: processor, } } diff --git a/internal/api/client/user/user_test.go b/internal/api/client/user/user_test.go index 76d95b2d9..4a9a1a9d7 100644 --- a/internal/api/client/user/user_test.go +++ b/internal/api/client/user/user_test.go @@ -22,7 +22,6 @@ import ( "codeberg.org/gruf/go-store/kv" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/api/client/user" - "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" @@ -34,7 +33,6 @@ import ( type UserStandardTestSuite struct { suite.Suite - config *config.Config db db.DB tc typeutils.TypeConverter federator federation.Federator @@ -54,21 +52,21 @@ type UserStandardTestSuite struct { } func (suite *UserStandardTestSuite) SetupTest() { + testrig.InitTestLog() + testrig.InitTestConfig() suite.testTokens = testrig.NewTestTokens() suite.testClients = testrig.NewTestClients() suite.testApplications = testrig.NewTestApplications() suite.testUsers = testrig.NewTestUsers() suite.testAccounts = testrig.NewTestAccounts() - suite.config = testrig.NewTestConfig() suite.db = testrig.NewTestDB() suite.storage = testrig.NewTestStorage() - testrig.InitTestLog() suite.tc = testrig.NewTestTypeConverter(suite.db) suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil), suite.db), suite.storage) suite.sentEmails = make(map[string]string) suite.emailSender = testrig.NewEmailSender("../../../../web/template/", suite.sentEmails) suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator, suite.emailSender) - suite.userModule = user.New(suite.config, suite.processor).(*user.Module) + suite.userModule = user.New(suite.processor).(*user.Module) testrig.StandardDBSetup(suite.db, suite.testAccounts) testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") } |