diff options
| author | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 20:39:52 +0700 |
|---|---|---|
| committer | Alex S <alex.strizhakov@gmail.com> | 2019-04-02 20:39:52 +0700 |
| commit | fa8483cb808ef4b8b907d7ec0eeb882f3f47d927 (patch) | |
| tree | c710d397bb2c189026eee910ee910384abb8eab9 /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | d140738edf75467420b35c500716cf89de66548d (diff) | |
| parent | 180b87257cae481d4d9ffc9f03a06268ad8df569 (diff) | |
| download | pleroma-fa8483cb808ef4b8b907d7ec0eeb882f3f47d927.tar.gz | |
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index dffd401f7..72b7ea85e 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -955,7 +955,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do |> post(request_path) activity = Activity.get_by_id(note_activity.id) - activity_user = Repo.get_by(User, ap_id: note_activity.data["actor"]) + activity_user = User.get_by_ap_id(note_activity.data["actor"]) assert json_response(response, 200) == ActivityView.render("activity.json", %{ @@ -993,7 +993,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do |> post(request_path) activity = Activity.get_by_id(note_activity.id) - activity_user = Repo.get_by(User, ap_id: note_activity.data["actor"]) + activity_user = User.get_by_ap_id(note_activity.data["actor"]) assert json_response(response, 200) == ActivityView.render("activity.json", %{ @@ -1021,7 +1021,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do user = json_response(conn, 200) - fetched_user = Repo.get_by(User, nickname: "lain") + fetched_user = User.get_by_nickname("lain") assert user == UserView.render("show.json", %{user: fetched_user}) end |