aboutsummaryrefslogtreecommitdiff
path: root/test/pleroma/web/admin_api
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2021-11-15 14:31:27 +0000
committerlain <lain@soykaf.club>2021-11-15 14:31:27 +0000
commit4d341f51e17c36f8c59246d9b7dc5d8793b9fd78 (patch)
tree62b18e9b8c19c8ab008022c695a5b2a7d3e138f4 /test/pleroma/web/admin_api
parente2772d6bf1317616ef5a27396101bf44f123ee7e (diff)
parent871936b3ca800809c616147bc149c4ef4effed69 (diff)
downloadpleroma-4d341f51e17c36f8c59246d9b7dc5d8793b9fd78.tar.gz
Merge branch 'fix-tests' into 'develop'
Test fixes See merge request pleroma/pleroma!3532
Diffstat (limited to 'test/pleroma/web/admin_api')
-rw-r--r--test/pleroma/web/admin_api/controllers/media_proxy_cache_controller_test.exs30
1 files changed, 17 insertions, 13 deletions
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 5d872901e..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
@@ -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