Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 48 deletions

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 <https://pleroma.social/>
-# 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