diff options
Diffstat (limited to 'internal/timeline')
| -rw-r--r-- | internal/timeline/get_test.go | 8 | ||||
| -rw-r--r-- | internal/timeline/index_test.go | 8 | ||||
| -rw-r--r-- | internal/timeline/manager_test.go | 8 | ||||
| -rw-r--r-- | internal/timeline/prune_test.go | 8 | ||||
| -rw-r--r-- | internal/timeline/timeline_test.go | 4 |
5 files changed, 15 insertions, 21 deletions
diff --git a/internal/timeline/get_test.go b/internal/timeline/get_test.go index 7b76178ae..071f33aaf 100644 --- a/internal/timeline/get_test.go +++ b/internal/timeline/get_test.go @@ -26,7 +26,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/visibility" "github.com/superseriousbusiness/gotosocial/testrig" @@ -42,15 +41,14 @@ func (suite *GetTestSuite) SetupSuite() { } func (suite *GetTestSuite) SetupTest() { - var state state.State - state.Caches.Init() + suite.state.Caches.Init() testrig.InitTestLog() testrig.InitTestConfig() - suite.db = testrig.NewTestDB(&state) + suite.db = testrig.NewTestDB(&suite.state) suite.tc = testrig.NewTestTypeConverter(suite.db) - suite.filter = visibility.NewFilter(suite.db) + suite.filter = visibility.NewFilter(&suite.state) testrig.StandardDBSetup(suite.db, nil) diff --git a/internal/timeline/index_test.go b/internal/timeline/index_test.go index 27e47fb2a..d2d1741f6 100644 --- a/internal/timeline/index_test.go +++ b/internal/timeline/index_test.go @@ -25,7 +25,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/visibility" "github.com/superseriousbusiness/gotosocial/testrig" @@ -41,15 +40,14 @@ func (suite *IndexTestSuite) SetupSuite() { } func (suite *IndexTestSuite) SetupTest() { - var state state.State - state.Caches.Init() + suite.state.Caches.Init() testrig.InitTestLog() testrig.InitTestConfig() - suite.db = testrig.NewTestDB(&state) + suite.db = testrig.NewTestDB(&suite.state) suite.tc = testrig.NewTestTypeConverter(suite.db) - suite.filter = visibility.NewFilter(suite.db) + suite.filter = visibility.NewFilter(&suite.state) testrig.StandardDBSetup(suite.db, nil) diff --git a/internal/timeline/manager_test.go b/internal/timeline/manager_test.go index 8614bbc95..8fc4984d1 100644 --- a/internal/timeline/manager_test.go +++ b/internal/timeline/manager_test.go @@ -23,7 +23,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/visibility" "github.com/superseriousbusiness/gotosocial/testrig" @@ -39,15 +38,14 @@ func (suite *ManagerTestSuite) SetupSuite() { } func (suite *ManagerTestSuite) SetupTest() { - var state state.State - state.Caches.Init() + suite.state.Caches.Init() testrig.InitTestLog() testrig.InitTestConfig() - suite.db = testrig.NewTestDB(&state) + suite.db = testrig.NewTestDB(&suite.state) suite.tc = testrig.NewTestTypeConverter(suite.db) - suite.filter = visibility.NewFilter(suite.db) + suite.filter = visibility.NewFilter(&suite.state) testrig.StandardDBSetup(suite.db, nil) diff --git a/internal/timeline/prune_test.go b/internal/timeline/prune_test.go index 36aa411b3..7daf88b83 100644 --- a/internal/timeline/prune_test.go +++ b/internal/timeline/prune_test.go @@ -25,7 +25,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/processing" - "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/visibility" "github.com/superseriousbusiness/gotosocial/testrig" @@ -41,15 +40,14 @@ func (suite *PruneTestSuite) SetupSuite() { } func (suite *PruneTestSuite) SetupTest() { - var state state.State - state.Caches.Init() + suite.state.Caches.Init() testrig.InitTestLog() testrig.InitTestConfig() - suite.db = testrig.NewTestDB(&state) + suite.db = testrig.NewTestDB(&suite.state) suite.tc = testrig.NewTestTypeConverter(suite.db) - suite.filter = visibility.NewFilter(suite.db) + suite.filter = visibility.NewFilter(&suite.state) testrig.StandardDBSetup(suite.db, nil) diff --git a/internal/timeline/timeline_test.go b/internal/timeline/timeline_test.go index 94e2681c8..2207a3418 100644 --- a/internal/timeline/timeline_test.go +++ b/internal/timeline/timeline_test.go @@ -21,6 +21,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/typeutils" "github.com/superseriousbusiness/gotosocial/internal/visibility" @@ -29,8 +30,9 @@ import ( type TimelineStandardTestSuite struct { suite.Suite db db.DB + state state.State tc typeutils.TypeConverter - filter visibility.Filter + filter *visibility.Filter testAccounts map[string]*gtsmodel.Account testStatuses map[string]*gtsmodel.Status |