aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-06-16 19:03:45 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-06-16 19:03:45 +0300
commitb66e6eb521c2901da119179016c99751cb5e6f95 (patch)
tree3a1e4d730ebdea8fe338d83375535395591deb0b
parented189568f3c2c6fc6ae9ba4d676e95902b3019d1 (diff)
downloadpleroma-b66e6eb521c2901da119179016c99751cb5e6f95.tar.gz
fixes for tests
-rw-r--r--docs/configuration/storing_remote_media.md4
-rw-r--r--lib/pleroma/config/config_db.ex4
-rw-r--r--test/web/activity_pub/activity_pub_test.exs4
-rw-r--r--test/workers/cron/purge_expired_activities_worker_test.exs6
4 files changed, 7 insertions, 11 deletions
diff --git a/docs/configuration/storing_remote_media.md b/docs/configuration/storing_remote_media.md
index 7e91fe7d9..c01985d25 100644
--- a/docs/configuration/storing_remote_media.md
+++ b/docs/configuration/storing_remote_media.md
@@ -33,6 +33,6 @@ as soon as the post is received by your instance.
Add to your `prod.secret.exs`:
```
-config :pleroma, :instance,
- rewrite_policy: [Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy]
+config :pleroma, :mrf,
+ policies: [Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy]
```
diff --git a/lib/pleroma/config/config_db.ex b/lib/pleroma/config/config_db.ex
index c0f3fe888..134116863 100644
--- a/lib/pleroma/config/config_db.ex
+++ b/lib/pleroma/config/config_db.ex
@@ -54,13 +54,13 @@ defmodule Pleroma.ConfigDB do
defp create(params) do
%ConfigDB{}
- |> changeset(params, transform?)
+ |> changeset(params)
|> Repo.insert()
end
defp update(%ConfigDB{} = config, %{value: value}) do
config
- |> changeset(%{value: value}, transform?)
+ |> changeset(%{value: value})
|> Repo.update()
end
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 7693f6400..1c684df1a 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -2055,11 +2055,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
end
describe "global activity expiration" do
- setup do: clear_config([:instance, :rewrite_policy])
+ setup do: clear_config([:mrf, :policies])
test "creates an activity expiration for local Create activities" do
Pleroma.Config.put(
- [:instance, :rewrite_policy],
+ [:mrf, :policies],
Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy
)
diff --git a/test/workers/cron/purge_expired_activities_worker_test.exs b/test/workers/cron/purge_expired_activities_worker_test.exs
index 6d2991a60..b1db59fdf 100644
--- a/test/workers/cron/purge_expired_activities_worker_test.exs
+++ b/test/workers/cron/purge_expired_activities_worker_test.exs
@@ -13,7 +13,6 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
setup do
clear_config([ActivityExpiration, :enabled])
- clear_config([:instance, :rewrite_policy])
end
test "deletes an expiration activity" do
@@ -42,10 +41,7 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
test "works with ActivityExpirationPolicy" do
Pleroma.Config.put([ActivityExpiration, :enabled], true)
- Pleroma.Config.put(
- [:instance, :rewrite_policy],
- Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy
- )
+ clear_config([:mrf, :policies], Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy)
user = insert(:user)