From a2ad2d8d23196801de228fcec9121d6bed03fa25 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 5 Jun 2025 16:54:05 -0700 Subject: [PATCH 1/4] Remove unused import --- test/pleroma/web/web_finger/web_finger_controller_test.exs | 1 - 1 file changed, 1 deletion(-) diff --git a/test/pleroma/web/web_finger/web_finger_controller_test.exs b/test/pleroma/web/web_finger/web_finger_controller_test.exs index d60e8a585..be44e3a8b 100644 --- a/test/pleroma/web/web_finger/web_finger_controller_test.exs +++ b/test/pleroma/web/web_finger/web_finger_controller_test.exs @@ -5,7 +5,6 @@ defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do use Pleroma.Web.ConnCase - import ExUnit.CaptureLog import Pleroma.Factory import Tesla.Mock From 48316d168c644eeb622e03daf751983fcb5bbcdd Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 5 Jun 2025 16:55:07 -0700 Subject: [PATCH 2/4] Fix failing tests due to Builder.block/2 becoming Builder.block/3 with no default value --- lib/pleroma/web/activity_pub/builder.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pleroma/web/activity_pub/builder.ex b/lib/pleroma/web/activity_pub/builder.ex index ecb6df1f0..046316024 100644 --- a/lib/pleroma/web/activity_pub/builder.ex +++ b/lib/pleroma/web/activity_pub/builder.ex @@ -328,7 +328,7 @@ defmodule Pleroma.Web.ActivityPub.Builder do end @spec block(User.t(), User.t(), map()) :: {:ok, map(), keyword()} - def block(blocker, blocked, params) do + def block(blocker, blocked, params \\ %{}) do {:ok, %{ "id" => Utils.generate_activity_id(), From db65b35ca38f682b286786b23ed94ba1821dca65 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 5 Jun 2025 17:11:16 -0700 Subject: [PATCH 3/4] Fix test Returns JSON when format is not supported (Pleroma.Web.WebFinger.WebFingerControllerTest) If we want to return JSON when a badly behaving client requests text/html, we still have to accept it at the Plug --- lib/pleroma/web/router.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index f2f9d7246..dfab1b216 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -189,7 +189,7 @@ defmodule Pleroma.Web.Router do end pipeline :well_known do - plug(:accepts, ["activity+json", "json", "jrd", "jrd+json", "xml", "xrd+xml"]) + plug(:accepts, ["activity+json", "json", "jrd", "jrd+json", "xml", "xrd+xml", "html"]) end pipeline :config do From 922696376317266f6f8a3259b0a7ba91443c0663 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 5 Jun 2025 17:13:55 -0700 Subject: [PATCH 4/4] Fix test fallout from most recent merges --- changelog.d/fixtests.skip | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 changelog.d/fixtests.skip diff --git a/changelog.d/fixtests.skip b/changelog.d/fixtests.skip new file mode 100644 index 000000000..e69de29bb