Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation

2020-08-05 11:12:14 +02:00 · 2020-08-05 11:12:14 +02:00 · 19c108170e
commit 19c108170e
parent 878c7f3f30 474aba984f
17 changed files with 118 additions and 33 deletions
--- 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