diff options
| author | lambda <lain@soykaf.club> | 2019-05-01 10:41:00 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-01 10:41:00 +0000 |
| commit | 297596ce4800bed3e6b85721ec384a2a0a0a983f (patch) | |
| tree | a9ad05e1066d83285fe0be92c88d52609d99fc98 /test/web | |
| parent | a7c9e3b2428823a2d6a7f68d92d0acecd3ad947b (diff) | |
| parent | f11e7037c21d611cddd7f2eab64ebfc39630a078 (diff) | |
| download | pleroma-297596ce4800bed3e6b85721ec384a2a0a0a983f.tar.gz pleroma-297596ce4800bed3e6b85721ec384a2a0a0a983f.zip | |
Merge branch 'harmonize_return_types_in_user_module' into 'develop'
Harmonize return types in user module
Closes #718
See merge request pleroma/pleroma!1112
Diffstat (limited to 'test/web')
| -rw-r--r-- | test/web/activity_pub/transmogrifier_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs index 78429c7c6..c24b50f8c 100644 --- a/test/web/activity_pub/transmogrifier_test.exs +++ b/test/web/activity_pub/transmogrifier_test.exs @@ -219,7 +219,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do Pleroma.Config.put([:user, :deny_follow_blocked], true) user = insert(:user) - target = User.get_or_fetch("http://mastodon.example.org/users/admin") + {:ok, target} = User.get_or_fetch("http://mastodon.example.org/users/admin") {:ok, user} = User.block(user, target) |