projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/markdown-newlines' 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 605df6ed66b2fb841dd610067857fc7b8e603cfe..e76cbc75b348a45f61c97b5f4366ef44e79951d4 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,8
+14,8
@@
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])
+ 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 %{
@@
-37,7
+38,7
@@
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,
- "
cha
t_limit" => _,
+ "
shou
t_limit" => _,
"description_limit" => _
} = result
"description_limit" => _
} = result
@@
-46,6
+47,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
assert result["pleroma"]["metadata"]["federation"]
assert result["pleroma"]["metadata"]["fields_limits"]
assert result["pleroma"]["vapid_public_key"]
assert result["pleroma"]["metadata"]["federation"]
assert result["pleroma"]["metadata"]["fields_limits"]
assert result["pleroma"]["vapid_public_key"]
+ assert result["pleroma"]["stats"]["mau"] == 0
assert email == from_config_email
assert thumbnail == from_config_thumbnail
assert email == from_config_email
assert thumbnail == from_config_thumbnail
@@
-56,7
+58,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
user = insert(:user, %{local: true})
user2 = insert(:user, %{local: true})
user = insert(:user, %{local: true})
user2 = insert(:user, %{local: true})
- {:ok, _user2} = User.
deactivate(user2, !user2.deactivated
)
+ {:ok, _user2} = User.
set_activation(user2, false
)
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"})