hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fixes' into 'develop'

Browse source 
Fix test fallout from most recent merges

See merge request pleroma/pleroma!4365
This commit is contained in:
feld 2025-06-06 00:58:00 +00:00
commit 7101d8ab1e
4 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

0
changelog.d/fixtests.skip Normal file
View file

2
lib/pleroma/web/activity_pub/builder.ex
View file

@ -328,7 +328,7 @@ defmodule Pleroma.Web.ActivityPub.Builder do
end end
@spec block(User.t(), User.t(), map()) :: {:ok, map(), keyword()} @spec block(User.t(), User.t(), map()) :: {:ok, map(), keyword()}
def block(blocker, blocked, params) do def block(blocker, blocked, params \\ %{}) do
{:ok, {:ok,
%{ %{
"id" => Utils.generate_activity_id(), "id" => Utils.generate_activity_id(),

2
lib/pleroma/web/router.ex
View file

@ -189,7 +189,7 @@ defmodule Pleroma.Web.Router do
end end
pipeline :well_known do 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 end
pipeline :config do pipeline :config do

1
test/pleroma/web/web_finger/web_finger_controller_test.exs
View file

@ -5,7 +5,6 @@
defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do
use Pleroma.Web.ConnCase use Pleroma.Web.ConnCase
import ExUnit.CaptureLog
import Pleroma.Factory import Pleroma.Factory
import Tesla.Mock import Tesla.Mock