Merge branch 'fix-tests' into 'develop'

Test fixes

See merge request pleroma/pleroma!3532

mix.exs

@@ -138,7 +138,7 @@ defp deps do
       {:cowlib, "~> 2.9", override: true},
       {:gun, "~> 2.0.0-rc.1", override: true},
       {:jason, "~> 1.2"},
-      {:mogrify, "~> 0.7.4"},
+      {:mogrify, "~> 0.9.1"},
       {:ex_aws, "~> 2.1.6"},
       {:ex_aws_s3, "~> 2.0"},
       {:sweet_xml, "~> 0.6.6"},

mix.lock

@@ -78,7 +78,7 @@
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "mochiweb": {:hex, :mochiweb, "2.18.0", "eb55f1db3e6e960fac4e6db4e2db9ec3602cc9f30b86cd1481d56545c3145d2e", [:rebar3], [], "hexpm"},
   "mock": {:hex, :mock, "0.3.7", "75b3bbf1466d7e486ea2052a73c6e062c6256fb429d6797999ab02fa32f29e03", [:mix], [{:meck, "~> 0.9.2", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "4da49a4609e41fd99b7836945c26f373623ea968cfb6282742bcb94440cf7e5c"},
-  "mogrify": {:hex, :mogrify, "0.7.4", "9b2496dde44b1ce12676f85d7dc531900939e6367bc537c7243a1b089435b32d", [:mix], [], "hexpm", "50d79e337fba6bc95bfbef918058c90f50b17eed9537771e61d4619488f099c3"},
+  "mogrify": {:hex, :mogrify, "0.9.1", "a26f107c4987477769f272bd0f7e3ac4b7b75b11ba597fd001b877beffa9c068", [:mix], [], "hexpm", "134edf189337d2125c0948bf0c228fdeef975c594317452d536224069a5b7f05"},
   "mox": {:hex, :mox, "1.0.0", "4b3c7005173f47ff30641ba044eb0fe67287743eec9bd9545e37f3002b0a9f8b", [:mix], [], "hexpm", "201b0a20b7abdaaab083e9cf97884950f8a30a1350a1da403b3145e213c6f4df"},
   "myhtmlex": {:git, "https://git.pleroma.social/pleroma/myhtmlex.git", "ad0097e2f61d4953bfef20fb6abddf23b87111e6", [ref: "ad0097e2f61d4953bfef20fb6abddf23b87111e6", submodules: true]},
   "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm", "5c040b8469c1ff1b10093d3186e2e10dbe483cd73d79ec017993fb3985b8a9b3"},

test/pleroma/web/activity_pub/mrf/steal_emoji_policy_test.exs

@@ -9,11 +9,6 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicyTest do
   alias Pleroma.Emoji
   alias Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy
 
-  setup_all do
-    Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
-    :ok
-  end
-
   setup do
     emoji_path = [:instance, :static_dir] |> Config.get() |> Path.join("emoji/stolen")
 
@@ -49,6 +44,10 @@ test "Steals emoji on unknown shortcode from allowed remote host", %{
     refute "firedfox" in installed()
     refute File.exists?(path)
 
+    Tesla.Mock.mock(fn %{method: :get, url: "https://example.org/emoji/firedfox.png"} ->
+      %Tesla.Env{status: 200, body: File.read!("test/fixtures/image.jpg")}
+    end)
+
     clear_config(:mrf_steal_emoji, hosts: ["example.org"], size_limit: 284_468)
 
     assert {:ok, _message} = StealEmojiPolicy.filter(message)
@@ -78,6 +77,10 @@ test "reject shortcode", %{message: message} do
   test "reject if size is above the limit", %{message: message} do
     refute "firedfox" in installed()
 
+    Tesla.Mock.mock(fn %{method: :get, url: "https://example.org/emoji/firedfox.png"} ->
+      %Tesla.Env{status: 200, body: File.read!("test/fixtures/image.jpg")}
+    end)
+
     clear_config(:mrf_steal_emoji, hosts: ["example.org"], size_limit: 50_000)
 
     assert {:ok, _message} = StealEmojiPolicy.filter(message)

test/pleroma/web/admin_api/controllers/media_proxy_cache_controller_test.exs

@@ -47,30 +47,34 @@ test "shows banned MediaProxy URLs", %{conn: conn} 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 @@ test "search banned MediaProxy URLs", %{conn: conn} 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