projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into global-status-expiration
[akkoma]
/
test
/
user_test.exs
diff --git
a/test/user_test.exs
b/test/user_test.exs
index b07fed42bac84b2eb9b0830887e0ad4f74893f4c..d39787f35d5d00480b786e6619652295f610ee6e 100644
(file)
--- a/
test/user_test.exs
+++ b/
test/user_test.exs
@@
-24,7
+24,7
@@
defmodule Pleroma.UserTest do
:ok
end
:ok
end
- clear_config([:instance, :account_activation_required])
+
setup do:
clear_config([:instance, :account_activation_required])
describe "service actors" do
test "returns updated invisible actor" do
describe "service actors" do
test "returns updated invisible actor" do
@@
-86,7
+86,7
@@
defmodule Pleroma.UserTest do
{:ok, user: insert(:user)}
end
{:ok, user: insert(:user)}
end
- test "outgoing_relations_ap_ids/1", %{user: user} do
+ test "outgoing_relations
hips
_ap_ids/1", %{user: user} do
rel_types = [:block, :mute, :notification_mute, :reblog_mute, :inverse_subscription]
ap_ids_by_rel =
rel_types = [:block, :mute, :notification_mute, :reblog_mute, :inverse_subscription]
ap_ids_by_rel =
@@
-124,10
+124,10
@@
defmodule Pleroma.UserTest do
assert ap_ids_by_rel[:inverse_subscription] ==
Enum.sort(Enum.map(User.subscriber_users(user), & &1.ap_id))
assert ap_ids_by_rel[:inverse_subscription] ==
Enum.sort(Enum.map(User.subscriber_users(user), & &1.ap_id))
- outgoing_relations
_ap_ids = User.outgoing_relation
s_ap_ids(user, rel_types)
+ outgoing_relations
hips_ap_ids = User.outgoing_relationship
s_ap_ids(user, rel_types)
assert ap_ids_by_rel ==
assert ap_ids_by_rel ==
- Enum.into(outgoing_relations_ap_ids, %{}, fn {k, v} -> {k, Enum.sort(v)} end)
+ Enum.into(outgoing_relations
hips
_ap_ids, %{}, fn {k, v} -> {k, Enum.sort(v)} end)
end
end
end
end
@@
-297,7
+297,7
@@
defmodule Pleroma.UserTest do
end
describe "unfollow/2" do
end
describe "unfollow/2" do
- clear_config([:instance, :external_user_synchronization])
+
setup do:
clear_config([:instance, :external_user_synchronization])
test "unfollow with syncronizes external user" do
Pleroma.Config.put([:instance, :external_user_synchronization], true)
test "unfollow with syncronizes external user" do
Pleroma.Config.put([:instance, :external_user_synchronization], true)
@@
-375,10
+375,9
@@
defmodule Pleroma.UserTest do
password_confirmation: "test",
email: "email@example.com"
}
password_confirmation: "test",
email: "email@example.com"
}
-
- clear_config([:instance, :autofollowed_nicknames])
- clear_config([:instance, :welcome_message])
- clear_config([:instance, :welcome_user_nickname])
+ setup do: clear_config([:instance, :autofollowed_nicknames])
+ setup do: clear_config([:instance, :welcome_message])
+ setup do: clear_config([:instance, :welcome_user_nickname])
test "it autofollows accounts that are set for it" do
user = insert(:user)
test "it autofollows accounts that are set for it" do
user = insert(:user)
@@
-412,7
+411,7
@@
defmodule Pleroma.UserTest do
assert activity.actor == welcome_user.ap_id
end
assert activity.actor == welcome_user.ap_id
end
- clear_config([:instance, :account_activation_required])
+
setup do:
clear_config([:instance, :account_activation_required])
test "it requires an email, name, nickname and password, bio is optional when account_activation_required is enabled" do
Pleroma.Config.put([:instance, :account_activation_required], true)
test "it requires an email, name, nickname and password, bio is optional when account_activation_required is enabled" do
Pleroma.Config.put([:instance, :account_activation_required], true)
@@
-475,10
+474,7
@@
defmodule Pleroma.UserTest do
password_confirmation: "test",
email: "email@example.com"
}
password_confirmation: "test",
email: "email@example.com"
}
-
- clear_config([:instance, :account_activation_required]) do
- Pleroma.Config.put([:instance, :account_activation_required], true)
- end
+ setup do: clear_config([:instance, :account_activation_required], true)
test "it creates unconfirmed user" do
changeset = User.register_changeset(%User{}, @full_user_data)
test "it creates unconfirmed user" do
changeset = User.register_changeset(%User{}, @full_user_data)
@@
-621,9
+617,8
@@
defmodule Pleroma.UserTest do
ap_id: "http...",
avatar: %{some: "avatar"}
}
ap_id: "http...",
avatar: %{some: "avatar"}
}
-
- clear_config([:instance, :user_bio_length])
- clear_config([:instance, :user_name_length])
+ setup do: clear_config([:instance, :user_bio_length])
+ setup do: clear_config([:instance, :user_name_length])
test "it confirms validity" do
cs = User.remote_user_creation(@valid_remote)
test "it confirms validity" do
cs = User.remote_user_creation(@valid_remote)
@@
-1116,7
+1111,7
@@
defmodule Pleroma.UserTest do
[user: user]
end
[user: user]
end
- clear_config([:instance, :federating])
+
setup do:
clear_config([:instance, :federating])
test ".delete_user_activities deletes all create activities", %{user: user} do
{:ok, activity} = CommonAPI.post(user, %{"status" => "2hu"})
test ".delete_user_activities deletes all create activities", %{user: user} do
{:ok, activity} = CommonAPI.post(user, %{"status" => "2hu"})
@@
-1146,8
+1141,8
@@
defmodule Pleroma.UserTest do
object_two = insert(:note, user: follower)
activity_two = insert(:note_activity, user: follower, note: object_two)
object_two = insert(:note, user: follower)
activity_two = insert(:note_activity, user: follower, note: object_two)
- {:ok, like
, _} = CommonAPI.favorite(activity_two.id, user
)
- {:ok, like_two
, _} = CommonAPI.favorite(activity.id, follower
)
+ {:ok, like
} = CommonAPI.favorite(user, activity_two.id
)
+ {:ok, like_two
} = CommonAPI.favorite(follower, activity.id
)
{:ok, repeat, _} = CommonAPI.repeat(activity_two.id, user)
{:ok, job} = User.delete(user)
{:ok, repeat, _} = CommonAPI.repeat(activity_two.id, user)
{:ok, job} = User.delete(user)
@@
-1297,7
+1292,7
@@
defmodule Pleroma.UserTest do
end
describe "account_status/1" do
end
describe "account_status/1" do
- clear_config([:instance, :account_activation_required])
+
setup do:
clear_config([:instance, :account_activation_required])
test "return confirmation_pending for unconfirm user" do
Pleroma.Config.put([:instance, :account_activation_required], true)
test "return confirmation_pending for unconfirm user" do
Pleroma.Config.put([:instance, :account_activation_required], true)
@@
-1409,7
+1404,7
@@
defmodule Pleroma.UserTest do
bio = "A.k.a. @nick@domain.com"
expected_text =
bio = "A.k.a. @nick@domain.com"
expected_text =
- ~s(A.k.a. <span class="h-card"><a
data-user="#{remote_user.id}" class="u-url mention
" href="#{
+ ~s(A.k.a. <span class="h-card"><a
class="u-url mention" data-user="#{remote_user.id}
" href="#{
remote_user.ap_id
}" rel="ugc">@<span>nick@domain.com</span></a></span>)
remote_user.ap_id
}" rel="ugc">@<span>nick@domain.com</span></a></span>)
@@
-1665,7
+1660,7
@@
defmodule Pleroma.UserTest do
end
describe "following/followers synchronization" do
end
describe "following/followers synchronization" do
- clear_config([:instance, :external_user_synchronization])
+
setup do:
clear_config([:instance, :external_user_synchronization])
test "updates the counters normally on following/getting a follow when disabled" do
Pleroma.Config.put([:instance, :external_user_synchronization], false)
test "updates the counters normally on following/getting a follow when disabled" do
Pleroma.Config.put([:instance, :external_user_synchronization], false)
@@
-1770,7
+1765,7
@@
defmodule Pleroma.UserTest do
[local_user: local_user, remote_user: remote_user]
end
[local_user: local_user, remote_user: remote_user]
end
- clear_config([:instance, :limit_to_local_content])
+
setup do:
clear_config([:instance, :limit_to_local_content])
test "allows getting remote users by id no matter what :limit_to_local_content is set to", %{
remote_user: remote_user
test "allows getting remote users by id no matter what :limit_to_local_content is set to", %{
remote_user: remote_user