diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-14 18:15:56 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-05-14 18:15:56 +0700 |
| commit | 5e2b491276d5cd8d90fddf219f7653d1c9b31ef3 (patch) | |
| tree | c7d10c01a9b17ba9c732cb43e2097bd26d67e915 /test/user_test.exs | |
| parent | 1557b99beb3b406572ef2d3baaabed1c9baeca1c (diff) | |
| parent | cdcdbd88da76f18c21da7f6f15a29883044902c8 (diff) | |
| download | pleroma-5e2b491276d5cd8d90fddf219f7653d1c9b31ef3.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
Diffstat (limited to 'test/user_test.exs')
| -rw-r--r-- | test/user_test.exs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/user_test.exs b/test/user_test.exs index 00c06dfaa..0b65e89e9 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -350,7 +350,7 @@ defmodule Pleroma.UserTest do end test "it creates confirmed user if :confirmed option is given" do - changeset = User.register_changeset(%User{}, @full_user_data, confirmed: true) + changeset = User.register_changeset(%User{}, @full_user_data, need_confirmation: false) assert changeset.valid? {:ok, user} = Repo.insert(changeset) @@ -864,10 +864,12 @@ defmodule Pleroma.UserTest do {:ok, activity} = CommonAPI.post(user, %{"status" => "hey @#{user2.nickname}"}) + activity = Repo.preload(activity, :bookmark) + [notification] = Pleroma.Notification.for_user(user2) assert notification.activity.id == activity.id - assert [activity] == ActivityPub.fetch_public_activities(%{}) + assert [activity] == ActivityPub.fetch_public_activities(%{}) |> Repo.preload(:bookmark) assert [activity] == ActivityPub.fetch_activities([user2.ap_id | user2.following], %{"user" => user2}) |