[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes

# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex

1 files changed, 0 insertions, 31 deletions

diff --git a/test/web/digest_email_worker_test.exs b/test/web/digest_email_worker_test.exs
deleted file mode 100644
index 15002330f..000000000
--- a/test/web/digest_email_worker_test.exs
+++ /dev/null
@@ -1,31 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.DigestEmailWorkerTest do
-  use Pleroma.DataCase
-  import Pleroma.Factory
-
-  alias Pleroma.DigestEmailWorker
-  alias Pleroma.User
-  alias Pleroma.Web.CommonAPI
-
-  test "it sends digest emails" do
-    user = insert(:user)
-
-    date =
-      Timex.now()
-      |> Timex.shift(days: -10)
-      |> Timex.to_naive_datetime()
-
-    user2 = insert(:user, last_digest_emailed_at: date)
-    User.switch_email_notifications(user2, "digest", true)
-    CommonAPI.post(user, %{"status" => "hey @#{user2.nickname}!"})
-
-    DigestEmailWorker.perform()
-
-    assert_received {:email, email}
-    assert email.to == [{user2.name, user2.email}]
-    assert email.subject == "Your digest from #{Pleroma.Config.get(:instance)[:name]}"
-  end
-end