pleroma

commit: 7101d8ab1ea4efe1f32d4adadc23f79cd525edbe
parent 8484e09424480113ee75bf6d2a5f90073cb58ca6
Author: feld <feld@feld.me>
Date:   Fri,  6 Jun 2025 00:58:00 +0000

Merge branch 'fixes' into 'develop'

Fix test fallout from most recent merges

See merge request pleroma/pleroma!4365
Diffstat:
A
changelog.d/fixtests.skip
0

M
lib/pleroma/web/activity_pub/builder.ex
2
+-
M
lib/pleroma/web/router.ex
2
+-
M
test/pleroma/web/web_finger/web_finger_controller_test.exs
1
-

4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/changelog.d/fixtests.skip b/changelog.d/fixtests.skip
diff --git 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(),
diff --git 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
diff --git 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