projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
[akkoma]
/
test
/
user_test.exs
diff --git
a/test/user_test.exs
b/test/user_test.exs
index 158f98e6600488ba5d693704e784a9c0eacb1884..1b5e63bd4d9cdfe8509496998c45b6dbe9019f2c 100644
(file)
--- a/
test/user_test.exs
+++ b/
test/user_test.exs
@@
-585,7
+585,7
@@
defmodule Pleroma.UserTest do
user = insert(:user)
assert User.ap_id(user) ==
user = insert(:user)
assert User.ap_id(user) ==
- Pleroma.Web.Router.Helpers.feed_url(
+ Pleroma.Web.Router.Helpers.
user_
feed_url(
Pleroma.Web.Endpoint,
:feed_redirect,
user.nickname
Pleroma.Web.Endpoint,
:feed_redirect,
user.nickname
@@
-596,7
+596,7
@@
defmodule Pleroma.UserTest do
user = insert(:user)
assert User.ap_followers(user) ==
user = insert(:user)
assert User.ap_followers(user) ==
- Pleroma.Web.Router.Helpers.feed_url(
+ Pleroma.Web.Router.Helpers.
user_
feed_url(
Pleroma.Web.Endpoint,
:feed_redirect,
user.nickname
Pleroma.Web.Endpoint,
:feed_redirect,
user.nickname