diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 19:16:29 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 19:16:29 +0700 |
| commit | 9e0567ec5237fc7a2ba37f5291962f3c58fd21f8 (patch) | |
| tree | 6caabbf049051d3725662eb765013ee9b844f0cc /test/web/twitter_api/views | |
| parent | 484162c18774ff28842a517ae0afcaaf824e12bf (diff) | |
| parent | bd961a3badaf7aa7ffc97ab92a6b04367d1c514b (diff) | |
| download | pleroma-9e0567ec5237fc7a2ba37f5291962f3c58fd21f8.tar.gz pleroma-9e0567ec5237fc7a2ba37f5291962f3c58fd21f8.zip | |
Merge develop into feature/770-add-emoji-tags
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 |