diff options
| author | Egor <egor@kislitsyn.com> | 2019-04-22 07:20:43 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-22 07:20:43 +0000 |
| commit | b9cdf6d3b9940fded7d6be9f8771fd9c211afdd4 (patch) | |
| tree | 4cb4fc190215842d6a14c4a202ff2fda32cc223a /test/web/ostatus/ostatus_controller_test.exs | |
| parent | 05862ded7a156ad6db16a70ec90045a2149da97d (diff) | |
| download | pleroma-b9cdf6d3b9940fded7d6be9f8771fd9c211afdd4.tar.gz pleroma-b9cdf6d3b9940fded7d6be9f8771fd9c211afdd4.zip | |
Use `User.get_cached*` everywhere
Diffstat (limited to 'test/web/ostatus/ostatus_controller_test.exs')
| -rw-r--r-- | test/web/ostatus/ostatus_controller_test.exs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs index 2950f11c0..7441e5fce 100644 --- a/test/web/ostatus/ostatus_controller_test.exs +++ b/test/web/ostatus/ostatus_controller_test.exs @@ -6,7 +6,6 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do use Pleroma.Web.ConnCase import Pleroma.Factory alias Pleroma.Object - alias Pleroma.Repo alias Pleroma.User alias Pleroma.Web.CommonAPI alias Pleroma.Web.OStatus.ActivityRepresenter @@ -41,7 +40,8 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do assert response(conn, 200) # Set a wrong magic-key for a user so it has to refetch - salmon_user = User.get_by_ap_id("http://gs.example.org:4040/index.php/user/1") + salmon_user = User.get_cached_by_ap_id("http://gs.example.org:4040/index.php/user/1") + # Wrong key info_cng = User.Info.remote_user_creation(salmon_user.info, %{ @@ -52,7 +52,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do salmon_user |> Ecto.Changeset.change() |> Ecto.Changeset.put_embed(:info, info_cng) - |> Repo.update() + |> User.update_and_set_cache() conn = build_conn() @@ -86,7 +86,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do test "gets an object", %{conn: conn} do note_activity = insert(:note_activity) - user = User.get_by_ap_id(note_activity.data["actor"]) + user = User.get_cached_by_ap_id(note_activity.data["actor"]) [_, uuid] = hd(Regex.scan(~r/.+\/([\w-]+)$/, note_activity.data["object"]["id"])) url = "/objects/#{uuid}" |