summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-09-22 17:13:46 +0200
committerlain <lain@soykaf.club>2020-09-22 17:13:46 +0200
commitc95859e45b18dec1d00f721ef3c5b4bb1406ea37 (patch)
treec22f7a200c0e0e551796bf5e9f1b09afccd64dd4 /test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs
parent9853c90abba213bdc87dccf5620cb0d9eb19c049 (diff)
parent02f12ec6253093d8bedaf84d78d0f7e533745e1b (diff)
downloadpleroma-c95859e45b18dec1d00f721ef3c5b4bb1406ea37.tar.gz
pleroma-c95859e45b18dec1d00f721ef3c5b4bb1406ea37.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
Diffstat (limited to 'test/web/activity_pub/mrf/mediaproxy_warming_policy_test.exs')
-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)