summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/account_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-10-30 17:51:15 -0500
committerMark Felder <feld@FreeBSD.org>2019-10-30 17:51:15 -0500
commitfcea6a9d2c7ae3223a6ec5038869a68ec618cb77 (patch)
treea2cb03d2c00acc2d63bb448613d7b40817d1d7c9 /test/web/mastodon_api/controllers/account_controller_test.exs
parentae59b38203b5358ddbf7f2cc5e2cbc816d171452 (diff)
parent9b40e5f563cc3478bb1d619278b9c8e7d689f121 (diff)
downloadpleroma-fcea6a9d2c7ae3223a6ec5038869a68ec618cb77.tar.gz
pleroma-fcea6a9d2c7ae3223a6ec5038869a68ec618cb77.zip
Merge branch 'develop' into feature/fast_sanitize
Diffstat (limited to 'test/web/mastodon_api/controllers/account_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/account_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/account_controller_test.exs b/test/web/mastodon_api/controllers/account_controller_test.exs
index 00c83fd7b..8fc2d9300 100644
--- a/test/web/mastodon_api/controllers/account_controller_test.exs
+++ b/test/web/mastodon_api/controllers/account_controller_test.exs
@@ -471,7 +471,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
conn =
build_conn()
- |> assign(:user, follower)
+ |> assign(:user, User.get_cached_by_id(follower.id))
|> post("/api/v1/accounts/#{followed.id}/follow?reblogs=true")
assert %{"showing_reblogs" => true} = json_response(conn, 200)