diff options
| author | lain <lain@soykaf.club> | 2019-04-02 16:10:38 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-04-02 16:10:38 +0200 |
| commit | 39bcf93007a5a52ba374099d6b04692361e7fa9b (patch) | |
| tree | 358becb7f089c62d9f2a2634ca766ee7e7bad3f3 /test/web/twitter_api/views | |
| parent | fd07745d1b18e2a1eeb88a99eaa9d5e728d1aa71 (diff) | |
| parent | 180b87257cae481d4d9ffc9f03a06268ad8df569 (diff) | |
| download | pleroma-39bcf93007a5a52ba374099d6b04692361e7fa9b.tar.gz pleroma-39bcf93007a5a52ba374099d6b04692361e7fa9b.zip | |
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
Diffstat (limited to 'test/web/twitter_api/views')
| -rw-r--r-- | test/web/twitter_api/views/activity_view_test.exs | 2 | ||||
| -rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs index a1776b3e6..ee9a0c834 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -281,7 +281,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do convo_id = Utils.context_to_conversation_id(activity.data["object"]["context"]) - activity = Repo.get(Activity, activity.id) + activity = Activity.get_by_id(activity.id) result = ActivityView.render("activity.json", activity: announce) diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index 4e7f94795..0feaf4b64 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -292,7 +292,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do } } - blocker = Repo.get(User, blocker.id) + blocker = User.get_by_id(blocker.id) assert represented == UserView.render("show.json", %{user: user, for: blocker}) end |