summaryrefslogtreecommitdiff
path: root/test/web/activity_pub
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2020-09-18 18:38:20 +0000
committerfeld <feld@feld.me>2020-09-18 18:38:20 +0000
commit6c052bd5b6cc29d321b500654bd6b098d0e6c56a (patch)
tree9357c0e0f653f8e35d63e32eb0faf090e600a816 /test/web/activity_pub
parent91ddd47e513c5fc343ffa9bea069801b0142a115 (diff)
parenta42880040574701000470fc1c2dbd6f7242c1a06 (diff)
downloadpleroma-6c052bd5b6cc29d321b500654bd6b098d0e6c56a.tar.gz
pleroma-6c052bd5b6cc29d321b500654bd6b098d0e6c56a.zip
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy See merge request pleroma/pleroma!3001
Diffstat (limited to 'test/web/activity_pub')
-rw-r--r--test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs b/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs
index 313d59a66..1710c4d2a 100644
--- a/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs
+++ b/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs
@@ -22,6 +22,8 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicyTest do
}
}
+ setup do: clear_config([:media_proxy, :enabled], true)
+
test "it prefetches media proxy URIs" do
with_mock HTTP, get: fn _, _, _ -> {:ok, []} end do
MediaProxyWarmingPolicy.filter(@message)