X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fweb%2Fadmin_api%2Fcontrollers%2Fmedia_proxy_cache_controller_test.exs;h=1818c8a8e88ac525598b5815d4971f364c038357;hb=50892a198d14a628c37139761b709cd5e3261a23;hp=db935ad128c1a9063a8e2329fcec17ce4aa8c445;hpb=cf367fdbd53b50f4324a01ddabdc0520cd787321;p=akkoma

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 db935ad12..1818c8a8e 100644
--- 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
@@ -21,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
@@ -47,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
@@ -88,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