sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixes for tests

This commit is contained in:
Alexander Strizhakov 2020-06-16 19:03:45 +03:00
parent ed189568f3
commit b66e6eb521
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/configuration/storing_remote_media.md
View File

@ -33,6 +33,6 @@ as soon as the post is received by your instance.
Add to your `prod.secret.exs`: Add to your `prod.secret.exs`:
``` ```
config :pleroma, :instance, config :pleroma, :mrf,
rewrite_policy: [Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy] policies: [Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy]
``` ```

4
lib/pleroma/config/config_db.ex
View File

@ -54,13 +54,13 @@ defmodule Pleroma.ConfigDB do
defp create(params) do defp create(params) do
%ConfigDB{} %ConfigDB{}
|> changeset(params, transform?) |> changeset(params)
|> Repo.insert() |> Repo.insert()
end end
defp update(%ConfigDB{} = config, %{value: value}) do defp update(%ConfigDB{} = config, %{value: value}) do
config config
|> changeset(%{value: value}, transform?) |> changeset(%{value: value})
|> Repo.update() |> Repo.update()
end end

4
test/web/activity_pub/activity_pub_test.exs
View File

@ -2055,11 +2055,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
end end
describe "global activity expiration" do 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 test "creates an activity expiration for local Create activities" do
Pleroma.Config.put( Pleroma.Config.put(
[:instance, :rewrite_policy], [:mrf, :policies],
Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy
) )

6
test/workers/cron/purge_expired_activities_worker_test.exs
View File

@ -13,7 +13,6 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
setup do setup do
clear_config([ActivityExpiration, :enabled]) clear_config([ActivityExpiration, :enabled])
clear_config([:instance, :rewrite_policy])
end end
test "deletes an expiration activity" do test "deletes an expiration activity" do
@ -42,10 +41,7 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
test "works with ActivityExpirationPolicy" do test "works with ActivityExpirationPolicy" do
Pleroma.Config.put([ActivityExpiration, :enabled], true) Pleroma.Config.put([ActivityExpiration, :enabled], true)
Pleroma.Config.put( clear_config([:mrf, :policies], Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy)
[:instance, :rewrite_policy],
Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy
)
user = insert(:user) user = insert(:user)