diff options
Diffstat (limited to 'internal/processing/account/follow_test.go')
| -rw-r--r-- | internal/processing/account/follow_test.go | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/internal/processing/account/follow_test.go b/internal/processing/account/follow_test.go index c269dc710..9ea8ce1b8 100644 --- a/internal/processing/account/follow_test.go +++ b/internal/processing/account/follow_test.go @@ -25,7 +25,6 @@ import ( "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/ap" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/messages" "github.com/superseriousbusiness/gotosocial/internal/util" ) @@ -152,18 +151,11 @@ func (suite *FollowTestSuite) TestFollowRequestLocal() { } // There should be a message going to the worker. - var cMsg messages.FromClientAPI - select { - case cMsg = <-suite.fromClientAPIChan: - // No problem. - case <-time.After(5 * time.Second): - suite.FailNow("timed out waiting for message") - } - + cMsg, _ := suite.getClientMsg(5 * time.Second) suite.Equal(ap.ActivityCreate, cMsg.APActivityType) suite.Equal(ap.ActivityFollow, cMsg.APObjectType) - suite.Equal(requestingAccount.ID, cMsg.OriginAccount.ID) - suite.Equal(targetAccount.ID, cMsg.TargetAccount.ID) + suite.Equal(requestingAccount.ID, cMsg.Origin.ID) + suite.Equal(targetAccount.ID, cMsg.Target.ID) } func TestFollowTestS(t *testing.T) { |