Move mailer from Bamboo to Swoosh
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -1,14 +1,13 @@
|
||||
defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
use Mobilizon.Web.ConnCase
|
||||
use Bamboo.Test
|
||||
import Mobilizon.Factory
|
||||
import Swoosh.TestAssertions
|
||||
|
||||
alias Mobilizon.Actors.Actor
|
||||
alias Mobilizon.Events.Event
|
||||
alias Mobilizon.Federation.ActivityPub.Relay
|
||||
alias Mobilizon.Reports.{Note, Report}
|
||||
alias Mobilizon.Users.User
|
||||
alias Mobilizon.Web.Email
|
||||
|
||||
alias Mobilizon.GraphQL.{AbsintheHelpers, API}
|
||||
|
||||
@@ -563,13 +562,7 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
variables: %{"id" => user.id, "email" => "new@email.com", "notify" => false}
|
||||
)
|
||||
|
||||
refute_delivered_email(
|
||||
Email.Admin.user_email_change_old(%User{user | email: "new@email.com"}, user.email)
|
||||
)
|
||||
|
||||
refute_delivered_email(
|
||||
Email.Admin.user_email_change_new(%User{user | email: "new@email.com"}, user.email)
|
||||
)
|
||||
refute_email_sent()
|
||||
|
||||
assert res["errors"] == nil
|
||||
assert res["data"]["adminUpdateUser"]["email"] == "new@email.com"
|
||||
@@ -584,13 +577,18 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
variables: %{"id" => user.id, "email" => "new@email.com", "notify" => true}
|
||||
)
|
||||
|
||||
assert_delivered_email(
|
||||
Email.Admin.user_email_change_old(%User{user | email: "new@email.com"}, user.email)
|
||||
assert_email_sent(
|
||||
to: user.email,
|
||||
subject:
|
||||
"An administrator manually changed the email attached to your account on Test instance"
|
||||
)
|
||||
|
||||
assert_delivered_email(
|
||||
Email.Admin.user_email_change_new(%User{user | email: "new@email.com"}, user.email)
|
||||
)
|
||||
# # Swoosh.TestAssertions can't test multiple emails sent
|
||||
# assert_email_sent(
|
||||
# to: "new@email.com",
|
||||
# subject:
|
||||
# "An administrator manually changed the email attached to your account on Test instance"
|
||||
# )
|
||||
|
||||
assert res["errors"] == nil
|
||||
assert res["data"]["adminUpdateUser"]["email"] == "new@email.com"
|
||||
@@ -639,9 +637,7 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
variables: %{"id" => user.id, "role" => "MODERATOR", "notify" => false}
|
||||
)
|
||||
|
||||
refute_delivered_email(
|
||||
Email.Admin.user_role_change(%User{user | role: :moderator}, user.role)
|
||||
)
|
||||
refute_email_sent()
|
||||
|
||||
assert res["errors"] == nil
|
||||
assert res["data"]["adminUpdateUser"]["role"] == "MODERATOR"
|
||||
@@ -656,9 +652,7 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
variables: %{"id" => user.id, "role" => "MODERATOR", "notify" => true}
|
||||
)
|
||||
|
||||
assert_delivered_email(
|
||||
Email.Admin.user_role_change(%User{user | role: :moderator}, user.role)
|
||||
)
|
||||
assert_email_sent(to: user.email)
|
||||
|
||||
assert res["errors"] == nil
|
||||
assert res["data"]["adminUpdateUser"]["role"] == "MODERATOR"
|
||||
@@ -681,7 +675,7 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
variables: %{"id" => user.id, "confirmed" => true, "notify" => false}
|
||||
)
|
||||
|
||||
refute_delivered_email(Email.Admin.user_confirmation(user))
|
||||
refute_email_sent()
|
||||
|
||||
assert hd(res["errors"])["message"] == "Can't confirm an already confirmed user"
|
||||
end
|
||||
@@ -695,7 +689,7 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
variables: %{"id" => user.id, "confirmed" => false, "notify" => false}
|
||||
)
|
||||
|
||||
refute_delivered_email(Email.Admin.user_confirmation(user))
|
||||
refute_email_sent()
|
||||
|
||||
assert hd(res["errors"])["message"] == "Deconfirming users is not supported"
|
||||
end
|
||||
@@ -711,7 +705,7 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
variables: %{"id" => user.id, "confirmed" => true, "notify" => false}
|
||||
)
|
||||
|
||||
refute_delivered_email(Email.Admin.user_confirmation(user))
|
||||
refute_email_sent()
|
||||
|
||||
assert res["errors"] == nil
|
||||
refute res["data"]["adminUpdateUser"]["confirmedAt"] == nil
|
||||
@@ -728,7 +722,7 @@ defmodule Mobilizon.GraphQL.Resolvers.AdminTest do
|
||||
variables: %{"id" => user.id, "confirmed" => true, "notify" => true}
|
||||
)
|
||||
|
||||
assert_delivered_email(Email.Admin.user_confirmation(user))
|
||||
assert_email_sent(to: user.email)
|
||||
|
||||
assert res["errors"] == nil
|
||||
refute res["data"]["adminUpdateUser"]["confirmedAt"] == nil
|
||||
|
||||
Reference in New Issue
Block a user