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, 39 deletions

diff --git a/test/web/media_proxy/invalidations/http_test.exs b/test/web/media_proxy/invalidations/http_test.exs
deleted file mode 100644
index a1bef5237..000000000
--- a/test/web/media_proxy/invalidations/http_test.exs
+++ /dev/null
@@ -1,39 +0,0 @@
-defmodule Pleroma.Web.MediaProxy.Invalidation.HttpTest do
-  use ExUnit.Case
-  alias Pleroma.Web.MediaProxy.Invalidation
-
-  import ExUnit.CaptureLog
-  import Tesla.Mock
-
-  setup do
-    on_exit(fn -> Cachex.clear(:banned_urls_cache) end)
-  end
-
-  test "logs hasn't error message when request is valid" do
-    mock(fn
-      %{method: :purge, url: "http://example.com/media/example.jpg"} ->
-        %Tesla.Env{status: 200}
-    end)
-
-    refute capture_log(fn ->
-             assert Invalidation.Http.purge(
-                      ["http://example.com/media/example.jpg"],
-                      []
-                    ) == {:ok, ["http://example.com/media/example.jpg"]}
-           end) =~ "Error while cache purge"
-  end
-
-  test "it write error message in logs when request invalid" do
-    mock(fn
-      %{method: :purge, url: "http://example.com/media/example1.jpg"} ->
-        %Tesla.Env{status: 404}
-    end)
-
-    assert capture_log(fn ->
-             assert Invalidation.Http.purge(
-                      ["http://example.com/media/example1.jpg"],
-                      []
-                    ) == {:ok, ["http://example.com/media/example1.jpg"]}
-           end) =~ "Error while cache purge: url - http://example.com/media/example1.jpg"
-  end
-end