summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-01-09 06:36:50 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-01-09 06:36:50 +0000
commit74f48beec3bf78cd94cb6db5cbdb937505891eab (patch)
tree1a0ed2dadb80848015af1027a2bc43d4f748cf8d /test
parent2af67353c5014edcc24bf2ec27b2bc871bd80eb7 (diff)
downloadpleroma-74f48beec3bf78cd94cb6db5cbdb937505891eab.tar.gz
pleroma-74f48beec3bf78cd94cb6db5cbdb937505891eab.zip
user: remove entirely redundant remote_or_auth_active?/1.
auth_active?/1 can check remote users and return true directly.
Diffstat (limited to 'test')
-rw-r--r--test/user_test.exs8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/user_test.exs b/test/user_test.exs
index 419a576dc..1c4e84914 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -768,16 +768,16 @@ defmodule Pleroma.UserTest do
end
end
- test "remote_or_auth_active?/1 works correctly" do
+ test "auth_active?/1 works correctly" do
Pleroma.Config.put([:instance, :account_activation_required], true)
local_user = insert(:user, local: true, info: %{confirmation_pending: true})
confirmed_user = insert(:user, local: true, info: %{confirmation_pending: false})
remote_user = insert(:user, local: false)
- refute User.remote_or_auth_active?(local_user)
- assert User.remote_or_auth_active?(confirmed_user)
- assert User.remote_or_auth_active?(remote_user)
+ refute User.auth_active?(local_user)
+ assert User.auth_active?(confirmed_user)
+ assert User.auth_active?(remote_user)
Pleroma.Config.put([:instance, :account_activation_required], false)
end