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, 69 deletions

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 <https://pleroma.social/>
-# 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 ==
-             "<p>Reported by: <a href=\"#{reporter_url}\">#{reporter.nickname}</a></p>\n<p>Reported Account: <a href=\"#{
-               account_url
-             }\">#{account.nickname}</a></p>\n<p>Comment: Test comment\n<p> Statuses:\n  <ul>\n    <li><a href=\"#{
-               status_url
-             }\">#{status_url}</li>\n  </ul>\n</p>\n\n<p>\n<a href=\"http://localhost:4001/pleroma/admin/#/reports/index\">View Reports in AdminFE</a>\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 == """
-           <p>New account for review: <a href="#{account_url}">@#{account.nickname}</a></p>
-           <blockquote>Plz let me in</blockquote>
-           <a href="http://localhost:4001/pleroma/admin/#/users/#{account.id}/">Visit AdminFE</a>
-           """
-  end
-end