diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-05-18 13:37:38 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-05-18 13:37:38 +0300 |
| commit | 5ece901af3e887664653c79c5e61618cc5cf0ecf (patch) | |
| tree | 93fc7c3bdb70348d5ef91fa9f7db3293b17f9854 /test/web/ostatus | |
| parent | fd920c897339b9cedea042dd6698d14380cedae7 (diff) | |
| parent | 8e9a764dfcde315afd055c8e63543bfca24cc41b (diff) | |
| download | pleroma-5ece901af3e887664653c79c5e61618cc5cf0ecf.tar.gz pleroma-5ece901af3e887664653c79c5e61618cc5cf0ecf.zip | |
Resolve merge conflicts and remove IO.inspects
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 |