diff options
author | lain <lain@soykaf.club> | 2019-04-08 14:10:51 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-04-08 14:10:51 +0200 |
commit | a9f805c87100fd2ee1d8426460b81af4a235d574 (patch) | |
tree | 70179175f0ff84f3f4c7399f63694766aaa65b35 /test/web/ostatus/activity_representer_test.exs | |
parent | 5d871173d189a0019fda0ee76f8a324d90a163ee (diff) | |
parent | 4977e96fa408e8148a355b3c759af34ae3ca312d (diff) | |
download | pleroma-a9f805c87100fd2ee1d8426460b81af4a235d574.tar.gz pleroma-a9f805c87100fd2ee1d8426460b81af4a235d574.zip |
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'test/web/ostatus/activity_representer_test.exs')
-rw-r--r-- | test/web/ostatus/activity_representer_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/ostatus/activity_representer_test.exs b/test/web/ostatus/activity_representer_test.exs index 5cb135b4c..a4bb68c4d 100644 --- a/test/web/ostatus/activity_representer_test.exs +++ b/test/web/ostatus/activity_representer_test.exs @@ -116,10 +116,10 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do {:ok, announce, _object} = ActivityPub.announce(user, object) - announce = Repo.get(Activity, announce.id) + announce = Activity.get_by_id(announce.id) note_user = User.get_cached_by_ap_id(note.data["actor"]) - note = Repo.get(Activity, note.id) + note = Activity.get_by_id(note.id) note_xml = ActivityRepresenter.to_simple_form(note, note_user, true) |