mint/pleroma
1
0
Fork 0
Code Releases Activity

Merge branch 'develop' into features/remove-user-source_data

Browse Source
This commit is contained in:
rinpatch
2020-04-16 21:28:52 +03:00
parent e89078ac2a 252528a4b9
commit 942d7467ca
64 changed files with 857 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/web/common_api/common_api_test.exs
+2 -2
View File
@@ -553,7 +553,7 @@ defmodule Pleroma.Web.CommonAPITest do
assert {:ok, follower, followed, %{id: activity_id, data: %{"state" => "pending"}}} =
CommonAPI.follow(follower, followed)
assert User.get_follow_state(follower, followed) == "pending"
assert User.get_follow_state(follower, followed) == :follow_pending
assert {:ok, follower} = CommonAPI.unfollow(follower, followed)
assert User.get_follow_state(follower, followed) == nil
@@ -575,7 +575,7 @@ defmodule Pleroma.Web.CommonAPITest do
assert {:ok, follower, followed, %{id: activity_id, data: %{"state" => "pending"}}} =
CommonAPI.follow(follower, followed)
assert User.get_follow_state(follower, followed) == "pending"
assert User.get_follow_state(follower, followed) == :follow_pending
assert {:ok, follower} = CommonAPI.unfollow(follower, followed)
assert User.get_follow_state(follower, followed) == nil