Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy

# Conflicts:
#	lib/pleroma/instances/instance.ex

1 files changed, 0 insertions, 55 deletions

diff --git a/test/activity_expiration_test.exs b/test/activity_expiration_test.exs
deleted file mode 100644
index f86d79826..000000000
--- a/test/activity_expiration_test.exs
+++ /dev/null
@@ -1,55 +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.ActivityExpirationTest do
-  use Pleroma.DataCase
-  alias Pleroma.ActivityExpiration
-  import Pleroma.Factory
-
-  setup do: clear_config([ActivityExpiration, :enabled])
-
-  test "finds activities due to be deleted only" do
-    activity = insert(:note_activity)
-
-    expiration_due =
-      insert(:expiration_in_the_past, %{activity_id: activity.id}) |> Repo.preload(:activity)
-
-    activity2 = insert(:note_activity)
-    insert(:expiration_in_the_future, %{activity_id: activity2.id})
-
-    expirations = ActivityExpiration.due_expirations()
-
-    assert length(expirations) == 1
-    assert hd(expirations) == expiration_due
-  end
-
-  test "denies expirations that don't live long enough" do
-    activity = insert(:note_activity)
-    now = NaiveDateTime.utc_now()
-    assert {:error, _} = ActivityExpiration.create(activity, now)
-  end
-
-  test "deletes an expiration activity" do
-    Pleroma.Config.put([ActivityExpiration, :enabled], true)
-    activity = insert(:note_activity)
-
-    naive_datetime =
-      NaiveDateTime.add(
-        NaiveDateTime.utc_now(),
-        -:timer.minutes(2),
-        :millisecond
-      )
-
-    expiration =
-      insert(
-        :expiration_in_the_past,
-        %{activity_id: activity.id, scheduled_at: naive_datetime}
-      )
-
-    Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker.perform(%Oban.Job{})
-
-    refute Pleroma.Repo.get(Pleroma.Activity, activity.id)
-    refute Pleroma.Repo.get(Pleroma.ActivityExpiration, expiration.id)
-  end
-end