summaryrefslogtreecommitdiff
path: root/test/web/admin_api/controllers/relay_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-09-10 16:02:11 -0500
committerMark Felder <feld@FreeBSD.org>2020-09-10 16:05:22 -0500
commit55562ca9362d66553ea3638c91174bbeb6c637f1 (patch)
treebb0b57d0a40dec779b0bfbfcbf65f3b9d3bea2b3 /test/web/admin_api/controllers/relay_controller_test.exs
parent39f7fc5b8ef781c98136d1f9be50a14bff394233 (diff)
parent6316350918d1f55167fa384d55f385ff2c93e6bb (diff)
downloadpleroma-55562ca9362d66553ea3638c91174bbeb6c637f1.tar.gz
pleroma-55562ca9362d66553ea3638c91174bbeb6c637f1.zip
Merge branch 'develop' into feature/gen-magic
Diffstat (limited to 'test/web/admin_api/controllers/relay_controller_test.exs')
-rw-r--r--test/web/admin_api/controllers/relay_controller_test.exs15
1 files changed, 11 insertions, 4 deletions
diff --git a/test/web/admin_api/controllers/relay_controller_test.exs b/test/web/admin_api/controllers/relay_controller_test.exs
index 64086adc5..adadf2b5c 100644
--- a/test/web/admin_api/controllers/relay_controller_test.exs
+++ b/test/web/admin_api/controllers/relay_controller_test.exs
@@ -39,8 +39,10 @@ defmodule Pleroma.Web.AdminAPI.RelayControllerTest do
relay_url: "http://mastodon.example.org/users/admin"
})
- assert json_response_and_validate_schema(conn, 200) ==
- "http://mastodon.example.org/users/admin"
+ assert json_response_and_validate_schema(conn, 200) == %{
+ "actor" => "http://mastodon.example.org/users/admin",
+ "followed_back" => false
+ }
log_entry = Repo.one(ModerationLog)
@@ -59,8 +61,13 @@ defmodule Pleroma.Web.AdminAPI.RelayControllerTest do
conn = get(conn, "/api/pleroma/admin/relay")
- assert json_response_and_validate_schema(conn, 200)["relays"] --
- ["mastodon.example.org", "mstdn.io"] == []
+ assert json_response_and_validate_schema(conn, 200)["relays"] == [
+ %{
+ "actor" => "http://mastodon.example.org/users/admin",
+ "followed_back" => true
+ },
+ %{"actor" => "https://mstdn.io/users/mayuutann", "followed_back" => true}
+ ]
end
test "DELETE /relay", %{conn: conn, admin: admin} do