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

diff --git a/test/tasks/digest_test.exs b/test/tasks/digest_test.exs
deleted file mode 100644
index 0b444c86d..000000000
--- a/test/tasks/digest_test.exs
+++ /dev/null
@@ -1,56 +0,0 @@
-defmodule Mix.Tasks.Pleroma.DigestTest do
-  use Pleroma.DataCase
-
-  import Pleroma.Factory
-  import Swoosh.TestAssertions
-
-  alias Pleroma.Tests.ObanHelpers
-  alias Pleroma.Web.CommonAPI
-
-  setup_all do
-    Mix.shell(Mix.Shell.Process)
-
-    on_exit(fn ->
-      Mix.shell(Mix.Shell.IO)
-    end)
-
-    :ok
-  end
-
-  setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true)
-
-  describe "pleroma.digest test" do
-    test "Sends digest to the given user" do
-      user1 = insert(:user)
-      user2 = insert(:user)
-
-      Enum.each(0..10, fn i ->
-        {:ok, _activity} =
-          CommonAPI.post(user1, %{
-            status: "hey ##{i} @#{user2.nickname}!"
-          })
-      end)
-
-      yesterday =
-        NaiveDateTime.add(
-          NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second),
-          -60 * 60 * 24,
-          :second
-        )
-
-      {:ok, yesterday_date} = Timex.format(yesterday, "%F", :strftime)
-
-      :ok = Mix.Tasks.Pleroma.Digest.run(["test", user2.nickname, yesterday_date])
-
-      ObanHelpers.perform_all()
-
-      assert_receive {:mix_shell, :info, [message]}
-      assert message =~ "Digest email have been sent"
-
-      assert_email_sent(
-        to: {user2.name, user2.email},
-        html_body: ~r/here is what you've missed!/i
-      )
-    end
-  end
-end