diff options
| author | lain <lain@soykaf.club> | 2019-10-07 12:31:51 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-10-07 12:31:51 +0000 |
| commit | 6c278cfe09fb9fd5220743d8f69c6e232623a09b (patch) | |
| tree | 93f1716551e6677193b05f33583579e68ad512c2 /test/user_test.exs | |
| parent | e8395bedd2164723b641e1e28cf08e40875893bf (diff) | |
| parent | 0a99f1e8c5551dcf170722e5087a0401b2d907af (diff) | |
| download | pleroma-6c278cfe09fb9fd5220743d8f69c6e232623a09b.tar.gz | |
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/user_test.exs')
| -rw-r--r-- | test/user_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index ae21286e4..019e7b400 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -515,7 +515,7 @@ defmodule Pleroma.UserTest do user = insert(:user) assert User.ap_id(user) == - Pleroma.Web.Router.Helpers.o_status_url( + Pleroma.Web.Router.Helpers.feed_url( Pleroma.Web.Endpoint, :feed_redirect, user.nickname @@ -526,7 +526,7 @@ defmodule Pleroma.UserTest do user = insert(:user) assert User.ap_followers(user) == - Pleroma.Web.Router.Helpers.o_status_url( + Pleroma.Web.Router.Helpers.feed_url( Pleroma.Web.Endpoint, :feed_redirect, user.nickname |