diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-08-07 09:38:05 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-08-07 09:38:05 +0300 |
| commit | 1298a2ea2c63f14cc080eb549377c6a1274b1628 (patch) | |
| tree | fe50b19542682173af1314766571731f69e904f5 /test/web/mastodon_api/mastodon_api_test.exs | |
| parent | b8021016ebef23903c59e5140d4efb456a84a347 (diff) | |
| parent | b9ebb55d2aabdf4c99b05efab9d4ad31b25f888d (diff) | |
| download | pleroma-1298a2ea2c63f14cc080eb549377c6a1274b1628.tar.gz pleroma-1298a2ea2c63f14cc080eb549377c6a1274b1628.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_test.exs')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_test.exs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/test/web/mastodon_api/mastodon_api_test.exs b/test/web/mastodon_api/mastodon_api_test.exs index c08be37d4..0c5a38bf6 100644 --- a/test/web/mastodon_api/mastodon_api_test.exs +++ b/test/web/mastodon_api/mastodon_api_test.exs @@ -17,8 +17,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do test "returns error when followed user is deactivated" do follower = insert(:user) user = insert(:user, local: true, deactivated: true) - {:error, error} = MastodonAPI.follow(follower, user) - assert error == :rejected + assert {:error, _error} = MastodonAPI.follow(follower, user) end test "following for user" do |