projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'refactor/approval_pending_user_field' into 'develop'
[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 6a9ccd97983c6f9dc50b2026b0a90045d0cb5007..1d0f86e872656883db1c87c7016f44e0f1654ef6 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
@@
-1,8
+1,9
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
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
+ # TODO: Should not need Cachex
use Pleroma.Web.ConnCase
alias Pleroma.User
use Pleroma.Web.ConnCase
alias Pleroma.User
@@
-13,6
+14,9
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
assert result = json_response_and_validate_schema(conn, 200)
email = Pleroma.Config.get([:instance, :email])
assert result = json_response_and_validate_schema(conn, 200)
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])
+
# Note: not checking for "max_toot_chars" since it's optional
assert %{
"uri" => _,
# Note: not checking for "max_toot_chars" since it's optional
assert %{
"uri" => _,
@@
-24,7
+28,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
"streaming_api" => _
},
"stats" => _,
"streaming_api" => _
},
"stats" => _,
- "thumbnail" =>
_
,
+ "thumbnail" =>
from_config_thumbnail
,
"languages" => _,
"registrations" => _,
"approval_required" => _,
"languages" => _,
"registrations" => _,
"approval_required" => _,
@@
-33,7
+37,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
"avatar_upload_limit" => _,
"background_upload_limit" => _,
"banner_upload_limit" => _,
"avatar_upload_limit" => _,
"background_upload_limit" => _,
"banner_upload_limit" => _,
- "background_image" =>
_
,
+ "background_image" =>
from_config_background
,
"chat_limit" => _,
"description_limit" => _
} = result
"chat_limit" => _,
"description_limit" => _
} = result
@@
-45,6
+49,8
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
assert result["pleroma"]["vapid_public_key"]
assert email == from_config_email
assert result["pleroma"]["vapid_public_key"]
assert email == from_config_email
+ assert thumbnail == from_config_thumbnail
+ assert background == from_config_background
end
test "get instance stats", %{conn: conn} do
end
test "get instance stats", %{conn: conn} do