X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Fadmin_api%2Fcontrollers%2Fmedia_proxy_cache_controller_test.exs;h=f243d1fb29787508176b4cc6e687750456242a01;hb=2ed87fecfa98ca2885a581ba55351ddde038fd1c;hp=5ab6cb78a0255ba4a844476770c4bd8c7463de1e;hpb=02a2f25027fc0eb76e8e9cbc3765ea9798b27f61;p=akkoma

diff --git a/test/web/admin_api/controllers/media_proxy_cache_controller_test.exs b/test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
index 5ab6cb78a..f243d1fb2 100644
--- a/test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
+++ b/test/web/admin_api/controllers/media_proxy_cache_controller_test.exs
@@ -48,6 +48,9 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
         |> get("/api/pleroma/admin/media_proxy_caches?page_size=2")
         |> json_response_and_validate_schema(200)
 
+      assert response["page_size"] == 2
+      assert response["count"] == 5
+
       assert response["urls"] == [
                "http://localhost:4001/media/fb1f4d.jpg",
                "http://localhost:4001/media/a688346.jpg"
@@ -63,6 +66,9 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
                "http://localhost:4001/media/tb13f47.jpg"
              ]
 
+      assert response["page_size"] == 2
+      assert response["count"] == 5
+
       response =
         conn
         |> get("/api/pleroma/admin/media_proxy_caches?page_size=2&page=3")
@@ -70,6 +76,30 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
 
       assert response["urls"] == ["http://localhost:4001/media/wb1f46.jpg"]
     end
+
+    test "search banned MediaProxy URLs", %{conn: conn} do
+      MediaProxy.put_in_banned_urls([
+        "http://localhost:4001/media/a688346.jpg",
+        "http://localhost:4001/media/ff44b1f4d.jpg"
+      ])
+
+      MediaProxy.put_in_banned_urls("http://localhost:4001/media/gb1f44.jpg")
+      MediaProxy.put_in_banned_urls("http://localhost:4001/media/tb13f47.jpg")
+      MediaProxy.put_in_banned_urls("http://localhost:4001/media/wb1f46.jpg")
+
+      response =
+        conn
+        |> get("/api/pleroma/admin/media_proxy_caches?page_size=2&query=F44")
+        |> json_response_and_validate_schema(200)
+
+      assert response["urls"] == [
+               "http://localhost:4001/media/gb1f44.jpg",
+               "http://localhost:4001/media/ff44b1f4d.jpg"
+             ]
+
+      assert response["page_size"] == 2
+      assert response["count"] == 2
+    end
   end
 
   describe "POST /api/pleroma/admin/media_proxy_caches/delete" do
@@ -79,15 +109,13 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
         "http://localhost:4001/media/fb1f4d.jpg"
       ])
 
-      response =
-        conn
-        |> put_req_header("content-type", "application/json")
-        |> post("/api/pleroma/admin/media_proxy_caches/delete", %{
-          urls: ["http://localhost:4001/media/a688346.jpg"]
-        })
-        |> json_response_and_validate_schema(200)
+      conn
+      |> put_req_header("content-type", "application/json")
+      |> post("/api/pleroma/admin/media_proxy_caches/delete", %{
+        urls: ["http://localhost:4001/media/a688346.jpg"]
+      })
+      |> json_response_and_validate_schema(200)
 
-      assert response["urls"] == ["http://localhost:4001/media/a688346.jpg"]
       refute MediaProxy.in_banned_urls("http://localhost:4001/media/a688346.jpg")
       assert MediaProxy.in_banned_urls("http://localhost:4001/media/fb1f4d.jpg")
     end
@@ -106,13 +134,10 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
            purge: fn _, _ -> {"ok", 0} end
          ]}
       ] do
-        response =
-          conn
-          |> put_req_header("content-type", "application/json")
-          |> post("/api/pleroma/admin/media_proxy_caches/purge", %{urls: urls, ban: false})
-          |> json_response_and_validate_schema(200)
-
-        assert response["urls"] == urls
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> post("/api/pleroma/admin/media_proxy_caches/purge", %{urls: urls, ban: false})
+        |> json_response_and_validate_schema(200)
 
         refute MediaProxy.in_banned_urls("http://example.com/media/a688346.jpg")
         refute MediaProxy.in_banned_urls("http://example.com/media/fb1f4d.jpg")
@@ -126,16 +151,13 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
       ]
 
       with_mocks [{MediaProxy.Invalidation.Script, [], [purge: fn _, _ -> {"ok", 0} end]}] do
-        response =
-          conn
-          |> put_req_header("content-type", "application/json")
-          |> post("/api/pleroma/admin/media_proxy_caches/purge", %{
-            urls: urls,
-            ban: true
-          })
-          |> json_response_and_validate_schema(200)
-
-        assert response["urls"] == urls
+        conn
+        |> put_req_header("content-type", "application/json")
+        |> post(
+          "/api/pleroma/admin/media_proxy_caches/purge",
+          %{urls: urls, ban: true}
+        )
+        |> json_response_and_validate_schema(200)
 
         assert MediaProxy.in_banned_urls("http://example.com/media/a688346.jpg")
         assert MediaProxy.in_banned_urls("http://example.com/media/fb1f4d.jpg")