diff options
Diffstat (limited to 'testrig')
| -rw-r--r-- | testrig/oauthserver.go | 4 | ||||
| -rw-r--r-- | testrig/testmodels.go | 6 | ||||
| -rw-r--r-- | testrig/util.go | 11 |
3 files changed, 17 insertions, 4 deletions
diff --git a/testrig/oauthserver.go b/testrig/oauthserver.go index 49615cadc..7ed230c49 100644 --- a/testrig/oauthserver.go +++ b/testrig/oauthserver.go @@ -19,11 +19,13 @@ package testrig import ( + "context" + "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/oauth" ) // NewTestOauthServer returns an oauth server with the given db, and the default test logger. func NewTestOauthServer(db db.DB) oauth.Server { - return oauth.New(db, NewTestLog()) + return oauth.New(context.Background(), db, NewTestLog()) } diff --git a/testrig/testmodels.go b/testrig/testmodels.go index 23762707c..3f32b588d 100644 --- a/testrig/testmodels.go +++ b/testrig/testmodels.go @@ -58,7 +58,7 @@ func NewTestTokens() map[string]*gtsmodel.Token { "local_account_2": { ID: "01F8MGVVM1EDVYET710J27XY5R", ClientID: "01F8MGW47HN8ZXNHNZ7E47CDMQ", - UserID: "01F8MGWAPB4GJ42M4N0TCZSQ7K", + UserID: "01F8MH1VYJAE00TVVGMM5JNJ8X", RedirectURI: "http://localhost:8080", Scope: "read write follow push", Access: "PIPINALKNNNFNF98717NAMNAMNFKIJKJ881818KJKJAKJJJA", @@ -88,7 +88,7 @@ func NewTestClients() map[string]*gtsmodel.Client { ID: "01F8MGW47HN8ZXNHNZ7E47CDMQ", Secret: "8f5603a5-c721-46cd-8f1b-2e368f51379f", Domain: "http://localhost:8080", - UserID: "01F8MGWAPB4GJ42M4N0TCZSQ7K", // local_account_2 + UserID: "01F8MH1VYJAE00TVVGMM5JNJ8X", // local_account_2 }, } return clients @@ -420,7 +420,7 @@ func NewTestAccounts() map[string]*gtsmodel.Account { Note: "i post about like, i dunno, stuff, or whatever!!!!", Memorial: false, MovedToAccountID: "", - CreatedAt: time.Now().Add(-190 * time.Hour), + CreatedAt: TimeMustParse("2021-09-26T12:52:36+02:00"), UpdatedAt: time.Now().Add(-36 * time.Hour), Bot: false, Locked: false, diff --git a/testrig/util.go b/testrig/util.go index 0410366e3..6cadb90d2 100644 --- a/testrig/util.go +++ b/testrig/util.go @@ -24,6 +24,7 @@ import ( "mime/multipart" "net/url" "os" + "time" ) // CreateMultipartFormData is a handy function for taking a fieldname and a filename, and creating a multipart form bytes buffer @@ -76,3 +77,13 @@ func URLMustParse(stringURL string) *url.URL { } return u } + +// TimeMustParse tries to parse the given time as RFC3339, and panics if it can't. +// Should only be used in tests. +func TimeMustParse(timeString string) time.Time { + t, err := time.Parse(time.RFC3339, timeString) + if err != nil { + panic(err) + } + return t +} |