From 8539e386c3f00537f120487e717ec7b25fe6c572 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 12 Oct 2020 12:00:50 -0500
Subject: Add missing Copyright headers

---
 test/web/media_proxy/invalidations/http_test.exs   | 4 ++++
 test/web/media_proxy/invalidations/script_test.exs | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'test/web/media_proxy/invalidations')

diff --git a/test/web/media_proxy/invalidations/http_test.exs b/test/web/media_proxy/invalidations/http_test.exs
index a1bef5237..13d081325 100644
--- a/test/web/media_proxy/invalidations/http_test.exs
+++ b/test/web/media_proxy/invalidations/http_test.exs
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.MediaProxy.Invalidation.HttpTest do
   use ExUnit.Case
   alias Pleroma.Web.MediaProxy.Invalidation
diff --git a/test/web/media_proxy/invalidations/script_test.exs b/test/web/media_proxy/invalidations/script_test.exs
index 51833ab18..692cbb2df 100644
--- a/test/web/media_proxy/invalidations/script_test.exs
+++ b/test/web/media_proxy/invalidations/script_test.exs
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.MediaProxy.Invalidation.ScriptTest do
   use ExUnit.Case
   alias Pleroma.Web.MediaProxy.Invalidation
-- 
cgit v1.2.3


From 7dffaef4799b0e867e91e19b76567c0e1a19bb43 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 23 Jun 2020 18:16:47 +0300
Subject: tests consistency

---
 test/web/media_proxy/invalidations/http_test.exs   | 43 ----------------------
 test/web/media_proxy/invalidations/script_test.exs | 30 ---------------
 2 files changed, 73 deletions(-)
 delete mode 100644 test/web/media_proxy/invalidations/http_test.exs
 delete mode 100644 test/web/media_proxy/invalidations/script_test.exs

(limited to 'test/web/media_proxy/invalidations')

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 13d081325..000000000
--- a/test/web/media_proxy/invalidations/http_test.exs
+++ /dev/null
@@ -1,43 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-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
diff --git a/test/web/media_proxy/invalidations/script_test.exs b/test/web/media_proxy/invalidations/script_test.exs
deleted file mode 100644
index 692cbb2df..000000000
--- a/test/web/media_proxy/invalidations/script_test.exs
+++ /dev/null
@@ -1,30 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.MediaProxy.Invalidation.ScriptTest do
-  use ExUnit.Case
-  alias Pleroma.Web.MediaProxy.Invalidation
-
-  import ExUnit.CaptureLog
-
-  setup do
-    on_exit(fn -> Cachex.clear(:banned_urls_cache) end)
-  end
-
-  test "it logger error when script not found" do
-    assert capture_log(fn ->
-             assert Invalidation.Script.purge(
-                      ["http://example.com/media/example.jpg"],
-                      script_path: "./example"
-                    ) == {:error, "%ErlangError{original: :enoent}"}
-           end) =~ "Error while cache purge: %ErlangError{original: :enoent}"
-
-    capture_log(fn ->
-      assert Invalidation.Script.purge(
-               ["http://example.com/media/example.jpg"],
-               []
-             ) == {:error, "\"not found script path\""}
-    end)
-  end
-end
-- 
cgit v1.2.3