summaryrefslogtreecommitdiff
path: root/test/web/twitter_api/util_controller_test.exs
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2019-10-23 17:34:42 +0000
committerfeld <feld@feld.me>2019-10-23 17:34:42 +0000
commit17c237ba808d4356bb1e202e459680563b79ef99 (patch)
tree62faffc1033054e2aa1414d85bc0009c004c6910 /test/web/twitter_api/util_controller_test.exs
parent54077677eaad44ea355c7f0db7ea5e94183d5a30 (diff)
parentc0246309a5013b17a405644a0918ec0d3569eaf1 (diff)
downloadpleroma-17c237ba808d4356bb1e202e459680563b79ef99.tar.gz
pleroma-17c237ba808d4356bb1e202e459680563b79ef99.zip
Merge branch '1304-user-info-deprecation' into 'develop'
[#1304] User.Info deprecation Closes #1304 See merge request pleroma/pleroma!1851
Diffstat (limited to 'test/web/twitter_api/util_controller_test.exs')
-rw-r--r--test/web/twitter_api/util_controller_test.exs8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs
index 9d4cb70f0..246da4da4 100644
--- 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
- } == user.info.notification_settings
+ } == user.notification_settings
end
end
@@ -370,7 +370,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest 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 =
@@ -568,7 +568,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
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
@@ -583,7 +583,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
assert response == %{"error" => "Invalid password."}
user = User.get_cached_by_id(user.id)
- refute user.info.deactivated
+ refute user.deactivated
end
end