Merge branch 'fixes' into 'develop'

Fix test fallout from most recent merges

See merge request pleroma/pleroma!4365

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(),

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

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