projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow expires_at in filter requests
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
instance_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
index b998566591512c873f763051a5cb73a93b85a6a9..bc3d358193fcb37e8ce49ee1a9217c20f5cf17ef 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
@@
-10,12
+10,13
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
import Pleroma.Factory
test "get instance information", %{conn: conn} do
import Pleroma.Factory
test "get instance information", %{conn: conn} do
+ clear_config([:instance, :languages], ["en", "ja"])
conn = get(conn, "/api/v1/instance")
assert result = json_response_and_validate_schema(conn, 200)
conn = get(conn, "/api/v1/instance")
assert result = json_response_and_validate_schema(conn, 200)
-
email = Pleroma.Config.get([:instance, :email])
email = Pleroma.Config.get([:instance, :email])
- thumbnail = Pleroma.Web.base_url() <> Pleroma.Config.get([:instance, :instance_thumbnail])
- background = Pleroma.Web.base_url() <> Pleroma.Config.get([:instance, :background_image])
+
+ thumbnail = Pleroma.Web.Endpoint.url() <> Pleroma.Config.get([:instance, :instance_thumbnail])
+ background = Pleroma.Web.Endpoint.url() <> Pleroma.Config.get([:instance, :background_image])
# Note: not checking for "max_toot_chars" since it's optional
assert %{
# Note: not checking for "max_toot_chars" since it's optional
assert %{
@@
-29,7
+30,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
},
"stats" => _,
"thumbnail" => from_config_thumbnail,
},
"stats" => _,
"thumbnail" => from_config_thumbnail,
- "languages" =>
_
,
+ "languages" =>
["en", "ja"]
,
"registrations" => _,
"approval_required" => _,
"poll_limits" => _,
"registrations" => _,
"approval_required" => _,
"poll_limits" => _,
@@
-38,7
+39,6
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
"background_upload_limit" => _,
"banner_upload_limit" => _,
"background_image" => from_config_background,
"background_upload_limit" => _,
"banner_upload_limit" => _,
"background_image" => from_config_background,
- "chat_limit" => _,
"description_limit" => _
} = result
"description_limit" => _
} = result