diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:20:48 +0400 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:20:48 +0400 |
commit | 7f692343c80ddf353712490edfbcdb14866f5685 (patch) | |
tree | 7ef90078d87fafb1eb25986c92af17a9eede37be /test/web/push/impl_test.exs | |
parent | fc2eb1fbd6a5b38a3cf72e557cce1029d6b7f16f (diff) | |
parent | ce089615e1e89fbb63b0c0548906f3b6c22abac2 (diff) | |
download | pleroma-7f692343c80ddf353712490edfbcdb14866f5685.tar.gz pleroma-7f692343c80ddf353712490edfbcdb14866f5685.zip |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/web/push/impl_test.exs')
-rw-r--r-- | test/web/push/impl_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/push/impl_test.exs b/test/web/push/impl_test.exs index 089d55577..9121d90e7 100644 --- a/test/web/push/impl_test.exs +++ b/test/web/push/impl_test.exs @@ -134,7 +134,7 @@ defmodule Pleroma.Web.Push.ImplTest do user = insert(:user, nickname: "Bob") other_user = insert(:user) {:ok, _, _, activity} = CommonAPI.follow(user, other_user) - object = Object.normalize(activity) + object = Object.normalize(activity, false) assert Impl.format_body(%{activity: activity}, user, object) == "@Bob has followed you" @@ -170,7 +170,7 @@ defmodule Pleroma.Web.Push.ImplTest do "<span>Lorem ipsum dolor sit amet</span>, consectetur :firefox: adipiscing elit. Fusce sagittis finibus turpis." }) - {:ok, activity, _} = CommonAPI.favorite(activity.id, user) + {:ok, activity} = CommonAPI.favorite(user, activity.id) object = Object.normalize(activity) assert Impl.format_body(%{activity: activity}, user, object) == "@Bob has favorited your post" |