Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
6f90ceb2
Commit
6f90ceb2
authored
Nov 18, 2018
by
lain
Browse files
Fix follower count test.
parent
8e3d8bde
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/user.ex
View file @
6f90ceb2
...
...
@@ -222,7 +222,7 @@ def follow(%User{} = follower, %User{info: info} = followed) do
ap_followers
=
followed
.
follower_address
cond
do
following?
(
follower
,
followed
)
or
info
[
"
deactivated
"
]
->
following?
(
follower
,
followed
)
or
info
.
deactivated
->
{
:error
,
"Could not follow user:
#{
followed
.
nickname
}
is already on your list."
}
deny_follow_blocked
and
blocks?
(
followed
,
follower
)
->
...
...
test/user_test.exs
View file @
6f90ceb2
...
...
@@ -34,7 +34,7 @@ test "follow takes a user and another user" do
user
=
Repo
.
get
(
User
,
user
.
id
)
followed
=
User
.
get_by_ap_id
(
followed
.
ap_id
)
assert
followed
.
info
[
"
follower_count
"
]
==
1
assert
followed
.
info
.
follower_count
==
1
assert
User
.
ap_followers
(
followed
)
in
user
.
following
end
...
...
@@ -358,11 +358,11 @@ test "it sets the info->follower_count property" do
User
.
follow
(
follower
,
user
)
assert
user
.
info
[
"
follower_count
"
]
==
nil
assert
user
.
info
.
follower_count
==
0
{
:ok
,
user
}
=
User
.
update_follower_count
(
user
)
assert
user
.
info
[
"
follower_count
"
]
==
1
assert
user
.
info
.
follower_count
==
1
end
end
...
...
@@ -517,7 +517,7 @@ test ".delete deactivates a user, all follow relationships and all create activi
follower
=
Repo
.
get
(
User
,
follower
.
id
)
user
=
Repo
.
get
(
User
,
user
.
id
)
assert
user
.
info
[
"
deactivated
"
]
assert
user
.
info
.
deactivated
refute
User
.
following?
(
user
,
followed
)
refute
User
.
following?
(
followed
,
follower
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment