Merge branch 'warnings-as-errors' into 'develop'

[akkoma] / test / pleroma / web / admin_api / controllers / media_proxy_cache_controller_test.exs

diff --git a/test/pleroma/web/admin_api/controllers/media_proxy_cache_controller_test.exs b/test/pleroma/web/admin_api/controllers/media_proxy_cache_controller_test.exs
index f243d1fb29787508176b4cc6e687750456242a01..1818c8a8e88ac525598b5815d4971f364c038357 100644 (file)
--- a/test/pleroma/web/admin_api/controllers/media_proxy_cache_controller_test.exs
+++ b/test/pleroma/web/admin_api/controllers/media_proxy_cache_controller_test.exs
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
@@ -12,10 +12,6 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
 
   setup do: clear_config([:media_proxy])
 
-  setup do
-    on_exit(fn -> Cachex.clear(:banned_urls_cache) end)
-  end
-
   setup do
     admin = insert(:user, is_admin: true)
     token = insert(:oauth_admin_token, user: admin)
@@ -25,9 +21,9 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
       |> assign(:user, admin)
       |> assign(:token, token)
 
-    Config.put([:media_proxy, :enabled], true)
-    Config.put([:media_proxy, :invalidation, :enabled], true)
-    Config.put([:media_proxy, :invalidation, :provider], MediaProxy.Invalidation.Script)
+    clear_config([:media_proxy, :enabled], true)
+    clear_config([:media_proxy, :invalidation, :enabled], true)
+    clear_config([:media_proxy, :invalidation, :provider], MediaProxy.Invalidation.Script)
 
     {:ok, %{admin: admin, token: token, conn: conn}}
   end
@@ -51,30 +47,34 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
       assert response["page_size"] == 2
       assert response["count"] == 5
 
-      assert response["urls"] == [
-               "http://localhost:4001/media/fb1f4d.jpg",
-               "http://localhost:4001/media/a688346.jpg"
-             ]
+      results = response["urls"]
 
       response =
         conn
         |> get("/api/pleroma/admin/media_proxy_caches?page_size=2&page=2")
         |> json_response_and_validate_schema(200)
 
-      assert response["urls"] == [
-               "http://localhost:4001/media/gb1f44.jpg",
-               "http://localhost:4001/media/tb13f47.jpg"
-             ]
-
       assert response["page_size"] == 2
       assert response["count"] == 5
 
+      results = results ++ response["urls"]
+
       response =
         conn
         |> get("/api/pleroma/admin/media_proxy_caches?page_size=2&page=3")
         |> json_response_and_validate_schema(200)
 
-      assert response["urls"] == ["http://localhost:4001/media/wb1f46.jpg"]
+      results = results ++ response["urls"]
+
+      assert results |> Enum.sort() ==
+               [
+                 "http://localhost:4001/media/wb1f46.jpg",
+                 "http://localhost:4001/media/gb1f44.jpg",
+                 "http://localhost:4001/media/tb13f47.jpg",
+                 "http://localhost:4001/media/fb1f4d.jpg",
+                 "http://localhost:4001/media/a688346.jpg"
+               ]
+               |> Enum.sort()
     end
 
     test "search banned MediaProxy URLs", %{conn: conn} do
@@ -92,9 +92,9 @@ defmodule Pleroma.Web.AdminAPI.MediaProxyCacheControllerTest do
         |> 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["urls"] |> Enum.sort() == [
+               "http://localhost:4001/media/ff44b1f4d.jpg",
+               "http://localhost:4001/media/gb1f44.jpg"
              ]
 
       assert response["page_size"] == 2