summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2017-10-29 18:16:09 +0000
committerlambda <pleromagit@rogerbraun.net>2017-10-29 18:16:09 +0000
commit9168497f8fc051a12bf320bda9c762b96da2f27d (patch)
tree2e6905c7c2a6c12186dfbf060c822cab02615711 /test
parent353b66e4326c27aca4a81ee133b73454d5eb0853 (diff)
parent71f66bd4589faddc35137ed3197f685555b77aaf (diff)
downloadpleroma-9168497f8fc051a12bf320bda9c762b96da2f27d.tar.gz
pleroma-9168497f8fc051a12bf320bda9c762b96da2f27d.zip
Merge branch 'missing-mastodon-follow-endpoint' into 'develop'
Fix return type of /api/v1/follows See merge request pleroma/pleroma!3
Diffstat (limited to 'test')
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index af2351706..acdb08ac2 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -287,7 +287,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> assign(:user, user)
|> post("/api/v1/follows", %{"uri" => other_user.nickname})
- assert %{"id" => id, "following" => true} = json_response(conn, 200)
+ assert %{"id" => id} = json_response(conn, 200)
+ assert id == other_user.id
end
test "unimplemented block/mute endpoints" do