summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/views
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-17 15:51:24 +0200
committerlain <lain@soykaf.club>2020-04-17 15:51:24 +0200
commit8c2c325598dcd85f76752a17b39ce27689a65250 (patch)
tree5283acd447e60c401631aab4b01768d3f79d142e /test/web/activity_pub/views
parent372614cfd3119b589c9c47619445714e8ae6c07e (diff)
parent6936854878860d1f6d04db1cd14a00208c6a5728 (diff)
downloadpleroma-8c2c325598dcd85f76752a17b39ce27689a65250.tar.gz
pleroma-8c2c325598dcd85f76752a17b39ce27689a65250.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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" => [