projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
[akkoma]
/
test
/
web
/
admin_api
/
admin_api_controller_test.exs
diff --git
a/test/web/admin_api/admin_api_controller_test.exs
b/test/web/admin_api/admin_api_controller_test.exs
index ae287a95396b93942e64fbe3a100a140a2438c34..b3167a861007900dc7642e0de6a38b88c44859ad 100644
(file)
--- a/
test/web/admin_api/admin_api_controller_test.exs
+++ b/
test/web/admin_api/admin_api_controller_test.exs
@@
-317,13
+317,21
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
assert token_record
refute token_record.used
assert token_record
refute token_record.used
- Swoosh.TestAssertions.assert_email_sent(
- Pleroma.UserEmail.user_invitation_email(
+ notify_email = Pleroma.Config.get([:instance, :notify_email])
+ instance_name = Pleroma.Config.get([:instance, :name])
+
+ email =
+ Pleroma.Emails.UserEmail.user_invitation_email(
user,
token_record,
recipient_email,
recipient_name
)
user,
token_record,
recipient_email,
recipient_name
)
+
+ Swoosh.TestAssertions.assert_email_sent(
+ from: {instance_name, notify_email},
+ to: {recipient_name, recipient_email},
+ html_body: email.html_body
)
end
)
end
@@
-654,26
+662,26
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
token = json_response(conn, 200)
invite = UserInviteToken.find_by_token!(token)
refute invite.used
token = json_response(conn, 200)
invite = UserInviteToken.find_by_token!(token)
refute invite.used
- refute invite.expire_at
+ refute invite.expire
s
_at
refute invite.max_use
assert invite.invite_type == "one_time"
end
refute invite.max_use
assert invite.invite_type == "one_time"
end
- test "with expire_at" do
+ test "with expire
s
_at" do
admin = insert(:user, info: %{is_admin: true})
conn =
build_conn()
|> assign(:user, admin)
|> get("/api/pleroma/admin/invite_token", %{
admin = insert(:user, info: %{is_admin: true})
conn =
build_conn()
|> assign(:user, admin)
|> get("/api/pleroma/admin/invite_token", %{
- "invite" => %{"expire_at" => Date.to_string(Date.utc_today())}
+ "invite" => %{"expire
s
_at" => Date.to_string(Date.utc_today())}
})
token = json_response(conn, 200)
invite = UserInviteToken.find_by_token!(token)
refute invite.used
})
token = json_response(conn, 200)
invite = UserInviteToken.find_by_token!(token)
refute invite.used
- assert invite.expire_at == Date.utc_today()
+ assert invite.expire
s
_at == Date.utc_today()
refute invite.max_use
assert invite.invite_type == "date_limited"
end
refute invite.max_use
assert invite.invite_type == "date_limited"
end
@@
-691,38
+699,38
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
token = json_response(conn, 200)
invite = UserInviteToken.find_by_token!(token)
refute invite.used
token = json_response(conn, 200)
invite = UserInviteToken.find_by_token!(token)
refute invite.used
- refute invite.expire_at
+ refute invite.expire
s
_at
assert invite.max_use == 150
assert invite.invite_type == "reusable"
end
assert invite.max_use == 150
assert invite.invite_type == "reusable"
end
- test "with max use and expire_at" do
+ test "with max use and expire
s
_at" do
admin = insert(:user, info: %{is_admin: true})
conn =
build_conn()
|> assign(:user, admin)
|> get("/api/pleroma/admin/invite_token", %{
admin = insert(:user, info: %{is_admin: true})
conn =
build_conn()
|> assign(:user, admin)
|> get("/api/pleroma/admin/invite_token", %{
- "invite" => %{"max_use" => 150, "expire_at" => Date.to_string(Date.utc_today())}
+ "invite" => %{"max_use" => 150, "expire
s
_at" => Date.to_string(Date.utc_today())}
})
token = json_response(conn, 200)
invite = UserInviteToken.find_by_token!(token)
refute invite.used
})
token = json_response(conn, 200)
invite = UserInviteToken.find_by_token!(token)
refute invite.used
- assert invite.expire_at == Date.utc_today()
+ assert invite.expire
s
_at == Date.utc_today()
assert invite.max_use == 150
assert invite.invite_type == "reusable_date_limited"
end
end
assert invite.max_use == 150
assert invite.invite_type == "reusable_date_limited"
end
end
- describe "GET /api/pleroma/admin/invites
_list
" do
+ describe "GET /api/pleroma/admin/invites" do
test "no invites" do
admin = insert(:user, info: %{is_admin: true})
conn =
build_conn()
|> assign(:user, admin)
test "no invites" do
admin = insert(:user, info: %{is_admin: true})
conn =
build_conn()
|> assign(:user, admin)
- |> get("/api/pleroma/admin/invites
_list
")
+ |> get("/api/pleroma/admin/invites")
assert json_response(conn, 200) == %{"invites" => []}
end
assert json_response(conn, 200) == %{"invites" => []}
end
@@
-734,12
+742,12
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
conn =
build_conn()
|> assign(:user, admin)
conn =
build_conn()
|> assign(:user, admin)
- |> get("/api/pleroma/admin/invites
_list
")
+ |> get("/api/pleroma/admin/invites")
assert json_response(conn, 200) == %{
"invites" => [
%{
assert json_response(conn, 200) == %{
"invites" => [
%{
- "expire_at" => nil,
+ "expire
s
_at" => nil,
"id" => invite.id,
"invite_type" => "one_time",
"max_use" => nil,
"id" => invite.id,
"invite_type" => "one_time",
"max_use" => nil,
@@
-752,7
+760,7
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
end
end
end
end
- describe "POST /api/pleroma/admin/
invite_revok
e" do
+ describe "POST /api/pleroma/admin/
revoke_invit
e" do
test "with token" do
admin = insert(:user, info: %{is_admin: true})
{:ok, invite} = UserInviteToken.create_invite()
test "with token" do
admin = insert(:user, info: %{is_admin: true})
{:ok, invite} = UserInviteToken.create_invite()
@@
-760,10
+768,10
@@
defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
conn =
build_conn()
|> assign(:user, admin)
conn =
build_conn()
|> assign(:user, admin)
- |> post("/api/pleroma/admin/
invite_revok
e", %{"token" => invite.token})
+ |> post("/api/pleroma/admin/
revoke_invit
e", %{"token" => invite.token})
assert json_response(conn, 200) == %{
assert json_response(conn, 200) == %{
- "expire_at" => nil,
+ "expire
s
_at" => nil,
"id" => invite.id,
"invite_type" => "one_time",
"max_use" => nil,
"id" => invite.id,
"invite_type" => "one_time",
"max_use" => nil,