diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-07-16 14:51:36 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-07-16 14:51:36 -0500 |
commit | 38425ebdbf157377ccb0402f78dc3d02f81c55f5 (patch) | |
tree | 740f32837d28e918f097c948d89827d99434d5b2 /test/web/mastodon_api/mastodon_api_test.exs | |
parent | 8daacc911498d827fd68ea3d34eb1be9ae4a1ffe (diff) | |
parent | 3a2b2cb6f2d6ce39ae0d246649189c021c535992 (diff) | |
download | pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.tar.gz pleroma-38425ebdbf157377ccb0402f78dc3d02f81c55f5.zip |
Merge remote-tracking branch 'upstream/develop' into linkify
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_test.exs')
-rw-r--r-- | test/web/mastodon_api/mastodon_api_test.exs | 2 |
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 |