From 3ca98878d27478037233a92f72adb3fbade62035 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Fri, 9 Oct 2020 17:08:05 -0500 Subject: Deep link to the user account in AdminFE in account confirmation emails --- test/emails/admin_email_test.exs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/emails') diff --git a/test/emails/admin_email_test.exs b/test/emails/admin_email_test.exs index e24231e27..155057f3e 100644 --- a/test/emails/admin_email_test.exs +++ b/test/emails/admin_email_test.exs @@ -63,7 +63,7 @@ defmodule Pleroma.Emails.AdminEmailTest do assert res.html_body == """

New account for review: @#{account.nickname}

Plz let me in
- Visit AdminFE + Visit AdminFE """ end end -- cgit v1.2.3 From 7dffaef4799b0e867e91e19b76567c0e1a19bb43 Mon Sep 17 00:00:00 2001 From: Alexander Strizhakov Date: Tue, 23 Jun 2020 18:16:47 +0300 Subject: tests consistency --- test/emails/admin_email_test.exs | 69 ---------------------------------------- test/emails/mailer_test.exs | 55 -------------------------------- test/emails/user_email_test.exs | 48 ---------------------------- 3 files changed, 172 deletions(-) delete mode 100644 test/emails/admin_email_test.exs delete mode 100644 test/emails/mailer_test.exs delete mode 100644 test/emails/user_email_test.exs (limited to 'test/emails') diff --git a/test/emails/admin_email_test.exs b/test/emails/admin_email_test.exs deleted file mode 100644 index 155057f3e..000000000 --- a/test/emails/admin_email_test.exs +++ /dev/null @@ -1,69 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Emails.AdminEmailTest do - use Pleroma.DataCase - import Pleroma.Factory - - alias Pleroma.Emails.AdminEmail - alias Pleroma.Web.Router.Helpers - - test "build report email" do - config = Pleroma.Config.get(:instance) - to_user = insert(:user) - reporter = insert(:user) - account = insert(:user) - - res = - AdminEmail.report(to_user, reporter, account, [%{name: "Test", id: "12"}], "Test comment") - - status_url = Helpers.o_status_url(Pleroma.Web.Endpoint, :notice, "12") - reporter_url = Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, reporter.id) - account_url = Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) - - assert res.to == [{to_user.name, to_user.email}] - assert res.from == {config[:name], config[:notify_email]} - assert res.subject == "#{config[:name]} Report" - - assert res.html_body == - "

Reported by: #{reporter.nickname}

\n

Reported Account: #{account.nickname}

\n

Comment: Test comment\n

Statuses:\n

\n

\n\n

\nView Reports in AdminFE\n" - end - - test "it works when the reporter is a remote user without email" do - config = Pleroma.Config.get(:instance) - to_user = insert(:user) - reporter = insert(:user, email: nil, local: false) - account = insert(:user) - - res = - AdminEmail.report(to_user, reporter, account, [%{name: "Test", id: "12"}], "Test comment") - - assert res.to == [{to_user.name, to_user.email}] - assert res.from == {config[:name], config[:notify_email]} - end - - test "new unapproved registration email" do - config = Pleroma.Config.get(:instance) - to_user = insert(:user) - account = insert(:user, registration_reason: "Plz let me in") - - res = AdminEmail.new_unapproved_registration(to_user, account) - - account_url = Helpers.user_feed_url(Pleroma.Web.Endpoint, :feed_redirect, account.id) - - assert res.to == [{to_user.name, to_user.email}] - assert res.from == {config[:name], config[:notify_email]} - assert res.subject == "New account up for review on #{config[:name]} (@#{account.nickname})" - - assert res.html_body == """ -

New account for review: @#{account.nickname}

-
Plz let me in
- Visit AdminFE - """ - end -end diff --git a/test/emails/mailer_test.exs b/test/emails/mailer_test.exs deleted file mode 100644 index 9e232d2a0..000000000 --- a/test/emails/mailer_test.exs +++ /dev/null @@ -1,55 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Emails.MailerTest do - use Pleroma.DataCase - alias Pleroma.Emails.Mailer - - import Swoosh.TestAssertions - - @email %Swoosh.Email{ - from: {"Pleroma", "noreply@example.com"}, - html_body: "Test email", - subject: "Pleroma test email", - to: [{"Test User", "user1@example.com"}] - } - setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true) - - test "not send email when mailer is disabled" do - clear_config([Pleroma.Emails.Mailer, :enabled], false) - Mailer.deliver(@email) - :timer.sleep(100) - - refute_email_sent( - from: {"Pleroma", "noreply@example.com"}, - to: [{"Test User", "user1@example.com"}], - html_body: "Test email", - subject: "Pleroma test email" - ) - end - - test "send email" do - Mailer.deliver(@email) - :timer.sleep(100) - - assert_email_sent( - from: {"Pleroma", "noreply@example.com"}, - to: [{"Test User", "user1@example.com"}], - html_body: "Test email", - subject: "Pleroma test email" - ) - end - - test "perform" do - Mailer.perform(:deliver_async, @email, []) - :timer.sleep(100) - - assert_email_sent( - from: {"Pleroma", "noreply@example.com"}, - to: [{"Test User", "user1@example.com"}], - html_body: "Test email", - subject: "Pleroma test email" - ) - end -end diff --git a/test/emails/user_email_test.exs b/test/emails/user_email_test.exs deleted file mode 100644 index a75623bb4..000000000 --- a/test/emails/user_email_test.exs +++ /dev/null @@ -1,48 +0,0 @@ -# Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors -# SPDX-License-Identifier: AGPL-3.0-only - -defmodule Pleroma.Emails.UserEmailTest do - use Pleroma.DataCase - - alias Pleroma.Emails.UserEmail - alias Pleroma.Web.Endpoint - alias Pleroma.Web.Router - - import Pleroma.Factory - - test "build password reset email" do - config = Pleroma.Config.get(:instance) - user = insert(:user) - email = UserEmail.password_reset_email(user, "test_token") - assert email.from == {config[:name], config[:notify_email]} - assert email.to == [{user.name, user.email}] - assert email.subject == "Password reset" - assert email.html_body =~ Router.Helpers.reset_password_url(Endpoint, :reset, "test_token") - end - - test "build user invitation email" do - config = Pleroma.Config.get(:instance) - user = insert(:user) - token = %Pleroma.UserInviteToken{token: "test-token"} - email = UserEmail.user_invitation_email(user, token, "test@test.com", "Jonh") - assert email.from == {config[:name], config[:notify_email]} - assert email.subject == "Invitation to Pleroma" - assert email.to == [{"Jonh", "test@test.com"}] - - assert email.html_body =~ - Router.Helpers.redirect_url(Endpoint, :registration_page, token.token) - end - - test "build account confirmation email" do - config = Pleroma.Config.get(:instance) - user = insert(:user, confirmation_token: "conf-token") - email = UserEmail.account_confirmation_email(user) - assert email.from == {config[:name], config[:notify_email]} - assert email.to == [{user.name, user.email}] - assert email.subject == "#{config[:name]} account confirmation" - - assert email.html_body =~ - Router.Helpers.confirm_email_url(Endpoint, :confirm_email, user.id, "conf-token") - end -end -- cgit v1.2.3