Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 105 deletions

diff --git a/test/scheduled_activity_test.exs b/test/scheduled_activity_test.exs
deleted file mode 100644
index 7faa5660d..000000000
--- a/test/scheduled_activity_test.exs
+++ /dev/null
@@ -1,105 +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.ScheduledActivityTest do
-  use Pleroma.DataCase
-  alias Pleroma.DataCase
-  alias Pleroma.ScheduledActivity
-  import Pleroma.Factory
-
-  setup do: clear_config([ScheduledActivity, :enabled])
-
-  setup context do
-    DataCase.ensure_local_uploader(context)
-  end
-
-  describe "creation" do
-    test "scheduled activities with jobs when ScheduledActivity enabled" do
-      Pleroma.Config.put([ScheduledActivity, :enabled], true)
-      user = insert(:user)
-
-      today =
-        NaiveDateTime.utc_now()
-        |> NaiveDateTime.add(:timer.minutes(6), :millisecond)
-        |> NaiveDateTime.to_iso8601()
-
-      attrs = %{params: %{}, scheduled_at: today}
-      {:ok, sa1} = ScheduledActivity.create(user, attrs)
-      {:ok, sa2} = ScheduledActivity.create(user, attrs)
-
-      jobs =
-        Repo.all(from(j in Oban.Job, where: j.queue == "scheduled_activities", select: j.args))
-
-      assert jobs == [%{"activity_id" => sa1.id}, %{"activity_id" => sa2.id}]
-    end
-
-    test "scheduled activities without jobs when ScheduledActivity disabled" do
-      Pleroma.Config.put([ScheduledActivity, :enabled], false)
-      user = insert(:user)
-
-      today =
-        NaiveDateTime.utc_now()
-        |> NaiveDateTime.add(:timer.minutes(6), :millisecond)
-        |> NaiveDateTime.to_iso8601()
-
-      attrs = %{params: %{}, scheduled_at: today}
-      {:ok, _sa1} = ScheduledActivity.create(user, attrs)
-      {:ok, _sa2} = ScheduledActivity.create(user, attrs)
-
-      jobs =
-        Repo.all(from(j in Oban.Job, where: j.queue == "scheduled_activities", select: j.args))
-
-      assert jobs == []
-    end
-
-    test "when daily user limit is exceeded" do
-      user = insert(:user)
-
-      today =
-        NaiveDateTime.utc_now()
-        |> NaiveDateTime.add(:timer.minutes(6), :millisecond)
-        |> NaiveDateTime.to_iso8601()
-
-      attrs = %{params: %{}, scheduled_at: today}
-      {:ok, _} = ScheduledActivity.create(user, attrs)
-      {:ok, _} = ScheduledActivity.create(user, attrs)
-
-      {:error, changeset} = ScheduledActivity.create(user, attrs)
-      assert changeset.errors == [scheduled_at: {"daily limit exceeded", []}]
-    end
-
-    test "when total user limit is exceeded" do
-      user = insert(:user)
-
-      today =
-        NaiveDateTime.utc_now()
-        |> NaiveDateTime.add(:timer.minutes(6), :millisecond)
-        |> NaiveDateTime.to_iso8601()
-
-      tomorrow =
-        NaiveDateTime.utc_now()
-        |> NaiveDateTime.add(:timer.hours(36), :millisecond)
-        |> NaiveDateTime.to_iso8601()
-
-      {:ok, _} = ScheduledActivity.create(user, %{params: %{}, scheduled_at: today})
-      {:ok, _} = ScheduledActivity.create(user, %{params: %{}, scheduled_at: today})
-      {:ok, _} = ScheduledActivity.create(user, %{params: %{}, scheduled_at: tomorrow})
-      {:error, changeset} = ScheduledActivity.create(user, %{params: %{}, scheduled_at: tomorrow})
-      assert changeset.errors == [scheduled_at: {"total limit exceeded", []}]
-    end
-
-    test "when scheduled_at is earlier than 5 minute from now" do
-      user = insert(:user)
-
-      scheduled_at =
-        NaiveDateTime.utc_now()
-        |> NaiveDateTime.add(:timer.minutes(4), :millisecond)
-        |> NaiveDateTime.to_iso8601()
-
-      attrs = %{params: %{}, scheduled_at: scheduled_at}
-      {:error, changeset} = ScheduledActivity.create(user, attrs)
-      assert changeset.errors == [scheduled_at: {"must be at least 5 minutes from now", []}]
-    end
-  end
-end