summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/mastodon_api_test.exs
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-07-09 10:32:24 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-07-09 10:32:24 +0000
commit68036f5a3b7b609f4464650c2ae40b9679d45291 (patch)
tree25e0f0f372ea0f77719bb253dee13a4cd831de54 /test/web/mastodon_api/mastodon_api_test.exs
parent34d6009d82ef8949d689ed1f7c4ec2c2fad254c7 (diff)
parent00e54f8fe7af098ba829f7f7cd5511569dcd1c0a (diff)
downloadpleroma-68036f5a3b7b609f4464650c2ae40b9679d45291.tar.gz
pleroma-68036f5a3b7b609f4464650c2ae40b9679d45291.zip
Merge branch 'follow-pipeline' into 'develop'
Handle `Follow` activities with the pipeline See merge request pleroma/pleroma!2734
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_test.exs')
-rw-r--r--test/web/mastodon_api/mastodon_api_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_test.exs b/test/web/mastodon_api/mastodon_api_test.exs
index a7f9c5205..c08be37d4 100644
--- a/test/web/mastodon_api/mastodon_api_test.exs
+++ b/test/web/mastodon_api/mastodon_api_test.exs
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do
follower = insert(:user)
user = insert(:user, local: true, deactivated: true)
{:error, error} = MastodonAPI.follow(follower, user)
- assert error == "Could not follow user: #{user.nickname} is deactivated."
+ assert error == :rejected
end
test "following for user" do