projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
instance_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/instance_controller_test.exs
b/test/web/mastodon_api/controllers/instance_controller_test.exs
index 2c7fd9fd000bbe2e427a2520ad8c6e3096367738..2c61dc5bae3af6cd527f35b4bcf6fa2aa67a962f 100644
(file)
--- a/
test/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/instance_controller_test.exs
@@
-10,7
+10,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
test "get instance information", %{conn: conn} do
conn = get(conn, "/api/v1/instance")
test "get instance information", %{conn: conn} do
conn = get(conn, "/api/v1/instance")
- assert result = json_response(conn, 200)
+ assert result = json_response
_and_validate_schema
(conn, 200)
email = Pleroma.Config.get([:instance, :email])
# Note: not checking for "max_toot_chars" since it's optional
email = Pleroma.Config.get([:instance, :email])
# Note: not checking for "max_toot_chars" since it's optional
@@
-50,13
+50,13
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
insert(:user, %{local: false, nickname: "u@peer1.com"})
insert(:user, %{local: false, nickname: "u@peer2.com"})
insert(:user, %{local: false, nickname: "u@peer1.com"})
insert(:user, %{local: false, nickname: "u@peer2.com"})
- {:ok, _} = Pleroma.Web.CommonAPI.post(user, %{
"status" =>
"cofe"})
+ {:ok, _} = Pleroma.Web.CommonAPI.post(user, %{
status:
"cofe"})
Pleroma.Stats.force_update()
conn = get(conn, "/api/v1/instance")
Pleroma.Stats.force_update()
conn = get(conn, "/api/v1/instance")
- assert result = json_response(conn, 200)
+ assert result = json_response
_and_validate_schema
(conn, 200)
stats = result["stats"]
stats = result["stats"]
@@
-74,7
+74,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
conn = get(conn, "/api/v1/instance/peers")
conn = get(conn, "/api/v1/instance/peers")
- assert result = json_response(conn, 200)
+ assert result = json_response
_and_validate_schema
(conn, 200)
assert ["peer1.com", "peer2.com"] == Enum.sort(result)
end
assert ["peer1.com", "peer2.com"] == Enum.sort(result)
end