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 'upstream/develop' into block-behavior
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
auth_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/auth_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/auth_controller_test.exs
index d7834c876d820b10092cf9c61a278242aee555e8..1872dfd594042d6e4c48558a483a18f0487a5d70 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/auth_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/auth_controller_test.exs
@@
-1,9
+1,9
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do
- use Pleroma.Web.ConnCase
+ use Pleroma.Web.ConnCase
, async: true
alias Pleroma.Config
alias Pleroma.Repo
alias Pleroma.Config
alias Pleroma.Repo
@@
-136,7
+136,7
@@
defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do
end
test "it returns 204 when user is deactivated", %{conn: conn, user: user} do
end
test "it returns 204 when user is deactivated", %{conn: conn, user: user} do
- {:ok, user} = Repo.update(Ecto.Changeset.change(user,
deactivated: tru
e, local: true))
+ {:ok, user} = Repo.update(Ecto.Changeset.change(user,
is_active: fals
e, local: true))
conn = post(conn, "/auth/password?email=#{user.email}")
assert empty_json_response(conn)
conn = post(conn, "/auth/password?email=#{user.email}")
assert empty_json_response(conn)