summaryrefslogtreecommitdiff
path: root/test/tasks
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-02-19 16:58:28 +0000
committerMark Felder <feld@FreeBSD.org>2019-02-19 16:58:28 +0000
commit2d21ea1a0e1be2e737dc4d283e72207580856214 (patch)
treef377cf25c36de97d664f13cebacb6ff2e0d43b91 /test/tasks
parent10a11f083ca543022c61e24b1ec0cc83811d6d06 (diff)
parent1dd718e83c76db218f12a98344b568fe10ecbefe (diff)
downloadpleroma-2d21ea1a0e1be2e737dc4d283e72207580856214.tar.gz
pleroma-2d21ea1a0e1be2e737dc4d283e72207580856214.zip
Merge branch 'develop' into fix/twittercards
Diffstat (limited to 'test/tasks')
-rw-r--r--test/tasks/relay_test.exs4
-rw-r--r--test/tasks/user_test.exs2
2 files changed, 4 insertions, 2 deletions
diff --git a/test/tasks/relay_test.exs b/test/tasks/relay_test.exs
index 96fac4811..64ff07753 100644
--- a/test/tasks/relay_test.exs
+++ b/test/tasks/relay_test.exs
@@ -4,7 +4,9 @@
defmodule Mix.Tasks.Pleroma.RelayTest do
alias Pleroma.Activity
- alias Pleroma.Web.ActivityPub.{ActivityPub, Relay, Utils}
+ alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.ActivityPub.Utils
+ alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.User
use Pleroma.DataCase
diff --git a/test/tasks/user_test.exs b/test/tasks/user_test.exs
index 44271898c..7b814d171 100644
--- a/test/tasks/user_test.exs
+++ b/test/tasks/user_test.exs
@@ -151,7 +151,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
assert message =~ "Successfully unsubscribed"
user = User.get_by_nickname(user.nickname)
- assert length(user.following) == 0
+ assert Enum.empty?(user.following)
assert user.info.deactivated
end