projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Track object/create activity fetches
[akkoma]
/
test
/
user_test.exs
diff --git
a/test/user_test.exs
b/test/user_test.exs
index 27156f03669c51ed09b6f74f337d5fffe8014c26..a25b72f4ed2cdfb4cd011331434a8b6f73e4719c 100644
(file)
--- a/
test/user_test.exs
+++ b/
test/user_test.exs
@@
-69,8
+69,8
@@
defmodule Pleroma.UserTest do
locked = insert(:user, %{info: %{locked: true}})
follower = insert(:user)
locked = insert(:user, %{info: %{locked: true}})
follower = insert(:user)
-
Pleroma.Web.TwitterAPI.TwitterAPI.follow(follower, %{"user_id" => unlocked.id}
)
-
Pleroma.Web.TwitterAPI.TwitterAPI.follow(follower, %{"user_id" => locked.id}
)
+
CommonAPI.follow(follower, unlocked
)
+
CommonAPI.follow(follower, locked
)
assert {:ok, []} = User.get_follow_requests(unlocked)
assert {:ok, [activity]} = User.get_follow_requests(locked)
assert {:ok, []} = User.get_follow_requests(unlocked)
assert {:ok, [activity]} = User.get_follow_requests(locked)
@@
-83,9
+83,9
@@
defmodule Pleroma.UserTest do
pending_follower = insert(:user)
accepted_follower = insert(:user)
pending_follower = insert(:user)
accepted_follower = insert(:user)
-
Pleroma.Web.TwitterAPI.TwitterAPI.follow(pending_follower, %{"user_id" => locked.id}
)
-
Pleroma.Web.TwitterAPI.TwitterAPI.follow(pending_follower, %{"user_id" => locked.id}
)
-
Pleroma.Web.TwitterAPI.TwitterAPI.follow(accepted_follower, %{"user_id" => locked.id}
)
+
CommonAPI.follow(pending_follower, locked
)
+
CommonAPI.follow(pending_follower, locked
)
+
CommonAPI.follow(accepted_follower, locked
)
User.follow(accepted_follower, locked)
assert {:ok, [activity]} = User.get_follow_requests(locked)
User.follow(accepted_follower, locked)
assert {:ok, [activity]} = User.get_follow_requests(locked)
@@
-541,6
+541,9
@@
defmodule Pleroma.UserTest do
avatar: %{some: "avatar"}
}
avatar: %{some: "avatar"}
}
+ clear_config([:instance, :user_bio_length])
+ clear_config([:instance, :user_name_length])
+
test "it confirms validity" do
cs = User.remote_user_creation(@valid_remote)
assert cs.valid?
test "it confirms validity" do
cs = User.remote_user_creation(@valid_remote)
assert cs.valid?
@@
-1047,6
+1050,13
@@
defmodule Pleroma.UserTest do
refute Activity.get_by_id(activity.id)
end
refute Activity.get_by_id(activity.id)
end
+ test "it deletes deactivated user" do
+ {:ok, user} = insert(:user, info: %{deactivated: true}) |> User.set_cache()
+
+ assert {:ok, _} = User.delete(user)
+ refute User.get_by_id(user.id)
+ end
+
test "it deletes a user, all follow relationships and all activities", %{user: user} do
follower = insert(:user)
{:ok, follower} = User.follow(follower, user)
test "it deletes a user, all follow relationships and all activities", %{user: user} do
follower = insert(:user)
{:ok, follower} = User.follow(follower, user)
@@
-1243,18
+1253,18
@@
defmodule Pleroma.UserTest do
end
test "Adds rel=me on linkbacked urls" do
end
test "Adds rel=me on linkbacked urls" do
- user = insert(:user, ap_id: "http://social.example.org/users/lain")
+ user = insert(:user, ap_id: "http
s
://social.example.org/users/lain")
- bio = "http://example.
org
/rel_me/null"
+ bio = "http://example.
com
/rel_me/null"
expected_text = "<a href=\"#{bio}\">#{bio}</a>"
assert expected_text == User.parse_bio(bio, user)
expected_text = "<a href=\"#{bio}\">#{bio}</a>"
assert expected_text == User.parse_bio(bio, user)
- bio = "http://example.
org
/rel_me/link"
- expected_text = "<a href=\"#{bio}\">#{bio}</a>"
+ bio = "http://example.
com
/rel_me/link"
+ expected_text = "<a href=\"#{bio}\"
rel=\"me\"
>#{bio}</a>"
assert expected_text == User.parse_bio(bio, user)
assert expected_text == User.parse_bio(bio, user)
- bio = "http://example.
org
/rel_me/anchor"
- expected_text = "<a href=\"#{bio}\">#{bio}</a>"
+ bio = "http://example.
com
/rel_me/anchor"
+ expected_text = "<a href=\"#{bio}\"
rel=\"me\"
>#{bio}</a>"
assert expected_text == User.parse_bio(bio, user)
end
end
assert expected_text == User.parse_bio(bio, user)
end
end
@@
-1269,11
+1279,9
@@
defmodule Pleroma.UserTest do
{:ok, _follower2} = User.follow(follower2, user)
{:ok, _follower3} = User.follow(follower3, user)
{:ok, _follower2} = User.follow(follower2, user)
{:ok, _follower3} = User.follow(follower3, user)
- {:ok, _} = User.block(user, follower)
-
- user_show = Pleroma.Web.TwitterAPI.UserView.render("show.json", %{user: user})
+ {:ok, user} = User.block(user, follower)
- assert
Map.get(user_show, "followers_count")
== 2
+ assert
User.user_info(user).follower_count
== 2
end
describe "list_inactive_users_query/1" do
end
describe "list_inactive_users_query/1" do
@@
-1317,7
+1325,7
@@
defmodule Pleroma.UserTest do
to = Enum.random(users -- [user])
{:ok, _} =
to = Enum.random(users -- [user])
{:ok, _} =
-
Pleroma.Web.TwitterAPI.TwitterAPI.create_status
(user, %{
+
CommonAPI.post
(user, %{
"status" => "hey @#{to.nickname}"
})
end)
"status" => "hey @#{to.nickname}"
})
end)
@@
-1349,12
+1357,12
@@
defmodule Pleroma.UserTest do
Enum.each(recipients, fn to ->
{:ok, _} =
Enum.each(recipients, fn to ->
{:ok, _} =
-
Pleroma.Web.TwitterAPI.TwitterAPI.create_status
(sender, %{
+
CommonAPI.post
(sender, %{
"status" => "hey @#{to.nickname}"
})
{:ok, _} =
"status" => "hey @#{to.nickname}"
})
{:ok, _} =
-
Pleroma.Web.TwitterAPI.TwitterAPI.create_status
(sender, %{
+
CommonAPI.post
(sender, %{
"status" => "hey again @#{to.nickname}"
})
end)
"status" => "hey again @#{to.nickname}"
})
end)