summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/views
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-04-20 20:37:56 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-04-20 20:37:56 +0400
commit364eecc49f137ae3c7798ad240983591e27b134c (patch)
tree7ed228221db9794b0aae59fa0e548623c0aa12ae /test/web/activity_pub/views
parentdc8fa04192cc133749e762b78ec043e0902d046d (diff)
parent28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff)
downloadpleroma-364eecc49f137ae3c7798ad240983591e27b134c.tar.gz
pleroma-364eecc49f137ae3c7798ad240983591e27b134c.zip
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/web/activity_pub/views')
-rw-r--r--test/web/activity_pub/views/user_view_test.exs4
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" => [