projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update/oban' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
admin_api
/
controllers
/
admin_api_controller_test.exs
diff --git
a/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
b/test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
index 90b25b782a30b9a3390571051a13bc2f68f2737a..23e4bc3af585ea12076ba0254e71d9a84f717bf0 100644
(file)
--- a/
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
+++ b/
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
@@
-1,5
+1,5
@@
# 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.AdminAPI.AdminAPIControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
@@
-891,10
+891,10
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
describe "PATCH /confirm_email" do
test "it confirms emails of two users", %{conn: conn, admin: admin} do
describe "PATCH /confirm_email" do
test "it confirms emails of two users", %{conn: conn, admin: admin} do
- [first_user, second_user] = insert_pair(:user,
confirmation_pending: tru
e)
+ [first_user, second_user] = insert_pair(:user,
is_confirmed: fals
e)
- assert first_user.confirmation_pending == true
- assert second_user.confirmation_pending == true
+ refute first_user.is_confirmed
+ refute second_user.is_confirmed
ret_conn =
patch(conn, "/api/pleroma/admin/users/confirm_email", %{
ret_conn =
patch(conn, "/api/pleroma/admin/users/confirm_email", %{
@@
-906,8
+906,11
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
assert ret_conn.status == 200
assert ret_conn.status == 200
- assert first_user.confirmation_pending == true
- assert second_user.confirmation_pending == true
+ first_user = User.get_by_id(first_user.id)
+ second_user = User.get_by_id(second_user.id)
+
+ assert first_user.is_confirmed
+ assert second_user.is_confirmed
log_entry = Repo.one(ModerationLog)
log_entry = Repo.one(ModerationLog)
@@
-920,7
+923,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
describe "PATCH /resend_confirmation_email" do
test "it resend emails for two users", %{conn: conn, admin: admin} do
describe "PATCH /resend_confirmation_email" do
test "it resend emails for two users", %{conn: conn, admin: admin} do
- [first_user, second_user] = insert_pair(:user,
confirmation_pending: tru
e)
+ [first_user, second_user] = insert_pair(:user,
is_confirmed: fals
e)
ret_conn =
patch(conn, "/api/pleroma/admin/users/resend_confirmation_email", %{
ret_conn =
patch(conn, "/api/pleroma/admin/users/resend_confirmation_email", %{