Merge branch 'release/2.2.0' into 'stable'

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 54 deletions

diff --git a/test/workers/cron/digest_emails_worker_test.exs b/test/workers/cron/digest_emails_worker_test.exs
deleted file mode 100644
index 65887192e..000000000
--- a/test/workers/cron/digest_emails_worker_test.exs
+++ /dev/null
@@ -1,54 +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.Workers.Cron.DigestEmailsWorkerTest do
-  use Pleroma.DataCase
-
-  import Pleroma.Factory
-
-  alias Pleroma.Tests.ObanHelpers
-  alias Pleroma.User
-  alias Pleroma.Web.CommonAPI
-
-  setup do: clear_config([:email_notifications, :digest])
-
-  setup do
-    Pleroma.Config.put([:email_notifications, :digest], %{
-      active: true,
-      inactivity_threshold: 7,
-      interval: 7
-    })
-
-    user = insert(:user)
-
-    date =
-      Timex.now()
-      |> Timex.shift(days: -10)
-      |> Timex.to_naive_datetime()
-
-    user2 = insert(:user, last_digest_emailed_at: date)
-    {:ok, _} = User.switch_email_notifications(user2, "digest", true)
-    CommonAPI.post(user, %{status: "hey @#{user2.nickname}!"})
-
-    {:ok, user2: user2}
-  end
-
-  test "it sends digest emails", %{user2: user2} do
-    Pleroma.Workers.Cron.DigestEmailsWorker.perform(%Oban.Job{})
-    # Performing job(s) enqueued at previous step
-    ObanHelpers.perform_all()
-
-    assert_received {:email, email}
-    assert email.to == [{user2.name, user2.email}]
-    assert email.subject == "Your digest from #{Pleroma.Config.get(:instance)[:name]}"
-  end
-
-  test "it doesn't fail when a user has no email", %{user2: user2} do
-    {:ok, _} = user2 |> Ecto.Changeset.change(%{email: nil}) |> Pleroma.Repo.update()
-
-    Pleroma.Workers.Cron.DigestEmailsWorker.perform(%Oban.Job{})
-    # Performing job(s) enqueued at previous step
-    ObanHelpers.perform_all()
-  end
-end