projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'openapi/subscriptions' into 'develop'
[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 7aa7c8648a2f1ef5684b83abe5e63c21c9e61a48..90840d5ab6116412a0edc350d416eb393dbedd27 100644
(file)
--- a/
test/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/instance_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
@@
-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
@@
-34,6
+34,10
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
"banner_upload_limit" => _
} = result
"banner_upload_limit" => _
} = result
+ assert result["pleroma"]["metadata"]["features"]
+ assert result["pleroma"]["metadata"]["federation"]
+ assert result["pleroma"]["vapid_public_key"]
+
assert email == from_config_email
end
assert email == from_config_email
end
@@
-52,21
+56,13
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
conn = get(conn, "/api/v1/instance")
conn = get(conn, "/api/v1/instance")
- assert result = json_response(conn, 200)
+ assert result = json_response
_and_validate_schema
(conn, 200)
stats = result["stats"]
assert stats
assert stats["user_count"] == 1
stats = result["stats"]
assert stats
assert stats["user_count"] == 1
-
- assert stats["status_count"] == %{
- "all" => 1,
- "direct" => 0,
- "private" => 0,
- "public" => 1,
- "unlisted" => 0
- }
-
+ assert stats["status_count"] == 1
assert stats["domain_count"] == 2
end
assert stats["domain_count"] == 2
end
@@
-78,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