diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 14:05:34 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-04-02 14:05:34 +0300 |
| commit | 37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24 (patch) | |
| tree | 2e3f848e697426f4b79d8e02a2ba20df12368ca9 /test/web/twitter_api/views | |
| parent | 590c935d95f0ea4fb65994027a88a0623527af88 (diff) | |
| parent | 091baf93169895c62418ccee81b80d00416aaa56 (diff) | |
| download | pleroma-37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24.tar.gz pleroma-37925cbe78b7fc73f28cc85ffcf1e16fb00f7a24.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
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 |