Browse Source

replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`

tags/v1.1.4
Egor Kislitsyn 5 years ago
parent
commit
9a59c26619
4 changed files with 6 additions and 6 deletions
  1. +2
    -2
      test/web/activity_pub/activity_pub_test.exs
  2. +1
    -1
      test/web/mastodon_api/status_view_test.exs
  3. +1
    -1
      test/web/salmon/salmon_test.exs
  4. +2
    -2
      test/web/twitter_api/twitter_api_controller_test.exs

+ 2
- 2
test/web/activity_pub/activity_pub_test.exs View File

@@ -638,8 +638,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
describe "fetch the latest Follow" do
test "fetches the latest Follow activity" do
%Activity{data: %{"type" => "Follow"}} = activity = insert(:follow_activity)
follower = Repo.get_by(User, ap_id: activity.data["actor"])
followed = Repo.get_by(User, ap_id: activity.data["object"])
follower = User.get_by_ap_id(activity.data["actor"])
followed = User.get_by_ap_id(activity.data["object"])

assert activity == Utils.fetch_latest_follow(follower, followed)
end


+ 1
- 1
test/web/mastodon_api/status_view_test.exs View File

@@ -175,7 +175,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do

status = StatusView.render("status.json", %{activity: activity})

actor = Repo.get_by(User, ap_id: activity.actor)
actor = User.get_by_ap_id(activity.actor)

assert status.mentions ==
Enum.map([user, actor], fn u -> AccountView.render("mention.json", %{user: u}) end)


+ 1
- 1
test/web/salmon/salmon_test.exs View File

@@ -99,7 +99,7 @@ defmodule Pleroma.Web.Salmon.SalmonTest do
}

{:ok, activity} = Repo.insert(%Activity{data: activity_data, recipients: activity_data["to"]})
user = Repo.get_by(User, ap_id: activity.data["actor"])
user = User.get_by_ap_id(activity.data["actor"])
{:ok, user} = Pleroma.Web.WebFinger.ensure_keys_present(user)

poster = fn url, _data, _headers ->


+ 2
- 2
test/web/twitter_api/twitter_api_controller_test.exs View File

@@ -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", %{


Loading…
Cancel
Save