projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...
[akkoma]
/
test
/
web
/
twitter_api
/
util_controller_test.exs
diff --git
a/test/web/twitter_api/util_controller_test.exs
b/test/web/twitter_api/util_controller_test.exs
index 9d4cb70f0677a2498b90d42fb369acb4687da78f..986ee01f35ecb850f9493045942b4e28873d8e68 100644
(file)
--- a/
test/web/twitter_api/util_controller_test.exs
+++ b/
test/web/twitter_api/util_controller_test.exs
@@
-164,7
+164,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
"follows" => true,
"non_follows" => true,
"non_followers" => true
"follows" => true,
"non_follows" => true,
"non_followers" => true
- } == user.
info.
notification_settings
+ } == user.notification_settings
end
end
end
end
@@
-366,11
+366,11
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|> response(200)
assert response =~ "Account followed!"
|> response(200)
assert response =~ "Account followed!"
- assert user2.follower_address in
refresh_record(user).following
+ assert user2.follower_address in
User.following(user)
end
test "returns error when user is deactivated", %{conn: conn} do
end
test "returns error when user is deactivated", %{conn: conn} do
- user = insert(:user,
info: %{deactivated: true}
)
+ user = insert(:user,
deactivated: true
)
user2 = insert(:user)
response =
user2 = insert(:user)
response =
@@
-387,7
+387,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
user = insert(:user)
user2 = insert(:user)
user = insert(:user)
user2 = insert(:user)
- {:ok, _user} = Pleroma.User.block(user2, user)
+ {:ok, _user
_block
} = Pleroma.User.block(user2, user)
response =
conn
response =
conn
@@
-438,7
+438,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|> response(200)
assert response =~ "Account followed!"
|> response(200)
assert response =~ "Account followed!"
- assert user2.follower_address in
refresh_record(user).following
+ assert user2.follower_address in
User.following(user)
end
test "returns error when followee not found", %{conn: conn} do
end
test "returns error when followee not found", %{conn: conn} do
@@
-485,7
+485,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
Pleroma.Config.put([:user, :deny_follow_blocked], true)
user = insert(:user)
user2 = insert(:user)
Pleroma.Config.put([:user, :deny_follow_blocked], true)
user = insert(:user)
user2 = insert(:user)
- {:ok, _user} = Pleroma.User.block(user2, user)
+ {:ok, _user
_block
} = Pleroma.User.block(user2, user)
response =
conn
response =
conn
@@
-568,7
+568,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
user = User.get_cached_by_id(user.id)
user = User.get_cached_by_id(user.id)
- assert user.
info.
deactivated == true
+ assert user.deactivated == true
end
test "it returns returns when password invalid", %{conn: conn} do
end
test "it returns returns when password invalid", %{conn: conn} do
@@
-583,7
+583,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
assert response == %{"error" => "Invalid password."}
user = User.get_cached_by_id(user.id)
assert response == %{"error" => "Invalid password."}
user = User.get_cached_by_id(user.id)
- refute user.
info.
deactivated
+ refute user.deactivated
end
end
end
end