diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-01 20:08:14 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-01 20:08:14 +0300 |
| commit | 98b96e45ababecb7554232787968f2f326f24e54 (patch) | |
| tree | 66e907ccc1acd2c667b57f5b5d0a8db34cbd288c /test/web/push/impl_test.exs | |
| parent | 2f2bd7fe72f474b7177c751a2dc3af716622ba91 (diff) | |
| parent | ef7d2b0f11a9bf74e982b73ae4cec632f93fbebc (diff) | |
| download | pleroma-98b96e45ababecb7554232787968f2f326f24e54.tar.gz pleroma-98b96e45ababecb7554232787968f2f326f24e54.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/push/impl_test.exs')
| -rw-r--r-- | test/web/push/impl_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/push/impl_test.exs b/test/web/push/impl_test.exs index 089d55577..9f931c941 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" |