summaryrefslogtreecommitdiff
path: root/test/user_test.exs
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-04-22 15:46:04 +0000
committerrinpatch <rinpatch@sdf.org>2020-05-01 00:55:37 +0300
commitbf4b5f385631840a0ae25c9214a4e2d39413b1fc (patch)
treeb3216e085a81d3e365b98c0f507b4eecafb43b8d /test/user_test.exs
parent2e58fe08cd5035e66d34c87f70588f8a307d51ed (diff)
downloadpleroma-bf4b5f385631840a0ae25c9214a4e2d39413b1fc.tar.gz
pleroma-bf4b5f385631840a0ae25c9214a4e2d39413b1fc.zip
Merge branch 'fix/follow-and-blocks-import' into 'develop'
Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416
Diffstat (limited to 'test/user_test.exs')
-rw-r--r--test/user_test.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/user_test.exs b/test/user_test.exs
index 555bbb92f..c48821a3c 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -760,8 +760,8 @@ defmodule Pleroma.UserTest do
]
{:ok, job} = User.follow_import(user1, identifiers)
- result = ObanHelpers.perform(job)
+ assert {:ok, result} = ObanHelpers.perform(job)
assert is_list(result)
assert result == [user2, user3]
end
@@ -983,8 +983,8 @@ defmodule Pleroma.UserTest do
]
{:ok, job} = User.blocks_import(user1, identifiers)
- result = ObanHelpers.perform(job)
+ assert {:ok, result} = ObanHelpers.perform(job)
assert is_list(result)
assert result == [user2, user3]
end