summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/account_controller_test.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-10-28 15:10:47 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-10-28 15:10:47 +0700
commit42708610857dd4aea1f488a31c1690cd37797333 (patch)
tree67b255a531530c21caaea86daae462b985a7bdea /test/web/mastodon_api/controllers/account_controller_test.exs
parentb777083f3f396a7d8c357ec968f72679befc691c (diff)
parente80f90e9dbdb6955e355d6a06eb69ee7051ba6df (diff)
downloadpleroma-42708610857dd4aea1f488a31c1690cd37797333.tar.gz
pleroma-42708610857dd4aea1f488a31c1690cd37797333.zip
Merge branch 'develop' into feature/move-activity
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)