diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-17 16:23:58 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-17 16:23:58 +0300 |
| commit | 6e6f95c6aed77cbde1a58edcdbb5cc4f68416bca (patch) | |
| tree | 923a489a9a6144bd31ff54d24140c1fd1259ae05 /test/web/activity_pub/views | |
| parent | ac672a9d6bfdd3cba7692f80a883bd38b0b09a57 (diff) | |
| parent | 09bd1d12c112fe45563c25a76afde65a3381aa26 (diff) | |
| download | pleroma-6e6f95c6aed77cbde1a58edcdbb5cc4f68416bca.tar.gz pleroma-6e6f95c6aed77cbde1a58edcdbb5cc4f68416bca.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/web/activity_pub/views')
| -rw-r--r-- | test/web/activity_pub/views/user_view_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/activity_pub/views/user_view_test.exs b/test/web/activity_pub/views/user_view_test.exs index ecb2dc386..8d00893a5 100644 --- a/test/web/activity_pub/views/user_view_test.exs +++ b/test/web/activity_pub/views/user_view_test.exs @@ -29,7 +29,7 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do {:ok, user} = insert(:user) - |> User.upgrade_changeset(%{fields: fields}) + |> User.update_changeset(%{fields: fields}) |> User.update_and_set_cache() assert %{ @@ -38,7 +38,7 @@ defmodule Pleroma.Web.ActivityPub.UserViewTest do end test "Renders with emoji tags" do - user = insert(:user, emoji: [%{"bib" => "/test"}]) + user = insert(:user, emoji: %{"bib" => "/test"}) assert %{ "tag" => [ |