Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 64 deletions

diff --git a/test/web/media_proxy/invalidation_test.exs b/test/web/media_proxy/invalidation_test.exs
deleted file mode 100644
index 926ae74ca..000000000
--- a/test/web/media_proxy/invalidation_test.exs
+++ /dev/null
@@ -1,64 +0,0 @@
-defmodule Pleroma.Web.MediaProxy.InvalidationTest do
-  use ExUnit.Case
-  use Pleroma.Tests.Helpers
-
-  alias Pleroma.Config
-  alias Pleroma.Web.MediaProxy.Invalidation
-
-  import ExUnit.CaptureLog
-  import Mock
-  import Tesla.Mock
-
-  setup do: clear_config([:media_proxy])
-
-  setup do
-    on_exit(fn -> Cachex.clear(:banned_urls_cache) end)
-  end
-
-  describe "Invalidation.Http" do
-    test "perform request to clear cache" do
-      Config.put([:media_proxy, :enabled], false)
-      Config.put([:media_proxy, :invalidation, :enabled], true)
-      Config.put([:media_proxy, :invalidation, :provider], Invalidation.Http)
-
-      Config.put([Invalidation.Http], method: :purge, headers: [{"x-refresh", 1}])
-      image_url = "http://example.com/media/example.jpg"
-      Pleroma.Web.MediaProxy.put_in_banned_urls(image_url)
-
-      mock(fn
-        %{
-          method: :purge,
-          url: "http://example.com/media/example.jpg",
-          headers: [{"x-refresh", 1}]
-        } ->
-          %Tesla.Env{status: 200}
-      end)
-
-      assert capture_log(fn ->
-               assert Pleroma.Web.MediaProxy.in_banned_urls(image_url)
-               assert Invalidation.purge([image_url]) == {:ok, [image_url]}
-               assert Pleroma.Web.MediaProxy.in_banned_urls(image_url)
-             end) =~ "Running cache purge: [\"#{image_url}\"]"
-    end
-  end
-
-  describe "Invalidation.Script" do
-    test "run script to clear cache" do
-      Config.put([:media_proxy, :enabled], false)
-      Config.put([:media_proxy, :invalidation, :enabled], true)
-      Config.put([:media_proxy, :invalidation, :provider], Invalidation.Script)
-      Config.put([Invalidation.Script], script_path: "purge-nginx")
-
-      image_url = "http://example.com/media/example.jpg"
-      Pleroma.Web.MediaProxy.put_in_banned_urls(image_url)
-
-      with_mocks [{System, [], [cmd: fn _, _ -> {"ok", 0} end]}] do
-        assert capture_log(fn ->
-                 assert Pleroma.Web.MediaProxy.in_banned_urls(image_url)
-                 assert Invalidation.purge([image_url]) == {:ok, [image_url]}
-                 assert Pleroma.Web.MediaProxy.in_banned_urls(image_url)
-               end) =~ "Running cache purge: [\"#{image_url}\"]"
-      end
-    end
-  end
-end