diff options
| author | feld <feld@feld.me> | 2019-10-23 17:34:42 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-10-23 17:34:42 +0000 |
| commit | 17c237ba808d4356bb1e202e459680563b79ef99 (patch) | |
| tree | 62faffc1033054e2aa1414d85bc0009c004c6910 /test/web/oauth/oauth_controller_test.exs | |
| parent | 54077677eaad44ea355c7f0db7ea5e94183d5a30 (diff) | |
| parent | c0246309a5013b17a405644a0918ec0d3569eaf1 (diff) | |
| download | pleroma-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/oauth/oauth_controller_test.exs')
| -rw-r--r-- | test/web/oauth/oauth_controller_test.exs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/web/oauth/oauth_controller_test.exs b/test/web/oauth/oauth_controller_test.exs index 41aaf6189..ad8d79083 100644 --- a/test/web/oauth/oauth_controller_test.exs +++ b/test/web/oauth/oauth_controller_test.exs @@ -780,8 +780,8 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do {:ok, user} = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password)) - |> User.change_info(&User.Info.confirmation_changeset(&1, need_confirmation: true)) - |> Repo.update() + |> User.confirmation_changeset(need_confirmation: true) + |> User.update_and_set_cache() refute Pleroma.User.auth_active?(user) @@ -808,7 +808,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password), - info: %{deactivated: true} + deactivated: true ) app = insert(:oauth_app) @@ -834,7 +834,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password), - info: %{password_reset_pending: true} + password_reset_pending: true ) app = insert(:oauth_app, scopes: ["read", "write"]) |