diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-17 19:57:14 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-17 19:57:14 +0700 |
| commit | 557f0e33a7de7ef89c72441ffc3a9c09c56fe9a7 (patch) | |
| tree | 8044adbc3645ccd1c7dce13b396e7d23db51a0fb /test/web/ostatus | |
| parent | f2936e0a0723956c167a06dc51518da172a508b2 (diff) | |
| parent | e5b34f5e0544371603bc2b570c26ede3182c2f8b (diff) | |
| download | pleroma-557f0e33a7de7ef89c72441ffc3a9c09c56fe9a7.tar.gz pleroma-557f0e33a7de7ef89c72441ffc3a9c09c56fe9a7.zip | |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Diffstat (limited to 'test/web/ostatus')
| -rw-r--r-- | test/web/ostatus/ostatus_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs index 2916caf8d..f6be16862 100644 --- a/test/web/ostatus/ostatus_test.exs +++ b/test/web/ostatus/ostatus_test.exs @@ -355,7 +355,7 @@ defmodule Pleroma.Web.OStatusTest do {:ok, user} = OStatus.find_or_make_user(uri) - user = Pleroma.User.get_cached_by_id(user.id) + user = User.get_cached_by_id(user.id) assert user.name == "Constance Variable" assert user.nickname == "lambadalambda@social.heldscal.la" assert user.local == false @@ -374,7 +374,7 @@ defmodule Pleroma.Web.OStatusTest do {:ok, user} = OStatus.find_or_make_user(uri) assert user.info == - %Pleroma.User.Info{ + %User.Info{ id: user.info.id, ap_enabled: false, background: %{}, @@ -407,7 +407,7 @@ defmodule Pleroma.Web.OStatusTest do {:ok, user} = OStatus.find_or_make_user(uri) old_name = user.name old_bio = user.bio - change = Ecto.Changeset.change(user, %{avatar: nil, bio: nil, old_name: nil}) + change = Ecto.Changeset.change(user, %{avatar: nil, bio: nil, name: nil}) {:ok, user} = Repo.update(change) refute user.avatar |