projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/mrf-simple' into 'develop'
[akkoma]
/
test
/
web
/
activity_pub
/
views
/
user_view_test.exs
diff --git
a/test/web/activity_pub/views/user_view_test.exs
b/test/web/activity_pub/views/user_view_test.exs
index 9fb9455d2c6693c95900d4c10ec869a3d4b6caa1..e6483db8bdc8f9dde223425fa6f3951332ffd9d7 100644
(file)
--- a/
test/web/activity_pub/views/user_view_test.exs
+++ b/
test/web/activity_pub/views/user_view_test.exs
@@
-2,11
+2,12
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
use Pleroma.DataCase
import Pleroma.Factory
use Pleroma.DataCase
import Pleroma.Factory
+ alias Pleroma.User
alias Pleroma.Web.ActivityPub.UserView
test "Renders a user, including the public key" do
user = insert(:user)
alias Pleroma.Web.ActivityPub.UserView
test "Renders a user, including the public key" do
user = insert(:user)
- {:ok, user} =
Pleroma.Web.WebFing
er.ensure_keys_present(user)
+ {:ok, user} =
Us
er.ensure_keys_present(user)
result = UserView.render("user.json", %{user: user})
result = UserView.render("user.json", %{user: user})
@@
-18,7
+19,7
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
test "Does not add an avatar image if the user hasn't set one" do
user = insert(:user)
test "Does not add an avatar image if the user hasn't set one" do
user = insert(:user)
- {:ok, user} =
Pleroma.Web.WebFing
er.ensure_keys_present(user)
+ {:ok, user} =
Us
er.ensure_keys_present(user)
result = UserView.render("user.json", %{user: user})
refute result["icon"]
result = UserView.render("user.json", %{user: user})
refute result["icon"]
@@
-32,7
+33,7
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
}
)
}
)
- {:ok, user} =
Pleroma.Web.WebFing
er.ensure_keys_present(user)
+ {:ok, user} =
Us
er.ensure_keys_present(user)
result = UserView.render("user.json", %{user: user})
assert result["icon"]["url"] == "https://someurl"
result = UserView.render("user.json", %{user: user})
assert result["icon"]["url"] == "https://someurl"
@@
-42,7
+43,7
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
describe "endpoints" do
test "local users have a usable endpoints structure" do
user = insert(:user)
describe "endpoints" do
test "local users have a usable endpoints structure" do
user = insert(:user)
- {:ok, user} =
Pleroma.Web.WebFing
er.ensure_keys_present(user)
+ {:ok, user} =
Us
er.ensure_keys_present(user)
result = UserView.render("user.json", %{user: user})
result = UserView.render("user.json", %{user: user})
@@
-58,7
+59,7
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
test "remote users have an empty endpoints structure" do
user = insert(:user, local: false)
test "remote users have an empty endpoints structure" do
user = insert(:user, local: false)
- {:ok, user} =
Pleroma.Web.WebFing
er.ensure_keys_present(user)
+ {:ok, user} =
Us
er.ensure_keys_present(user)
result = UserView.render("user.json", %{user: user})
result = UserView.render("user.json", %{user: user})
@@
-68,7
+69,7
@@
defmodule Pleroma.Web.ActivityPub.UserViewTest do
test "instance users do not expose oAuth endpoints" do
user = insert(:user, nickname: nil, local: true)
test "instance users do not expose oAuth endpoints" do
user = insert(:user, nickname: nil, local: true)
- {:ok, user} =
Pleroma.Web.WebFing
er.ensure_keys_present(user)
+ {:ok, user} =
Us
er.ensure_keys_present(user)
result = UserView.render("user.json", %{user: user})
result = UserView.render("user.json", %{user: user})