diff options
author | feld <feld@feld.me> | 2023-11-17 16:50:36 +0000 |
---|---|---|
committer | feld <feld@feld.me> | 2023-11-17 16:50:36 +0000 |
commit | 906b121a1053557016734be0bf224c5ad317ee08 (patch) | |
tree | 5e6b8a27b153f870478f224899df00f6335d5e74 /test | |
parent | be39146ecc6d55191f8ed3ec9cd3e113d8ee5e21 (diff) | |
parent | ca1b18ba2df38970582f64e0fed9147a5bfff43e (diff) | |
download | pleroma-906b121a1053557016734be0bf224c5ad317ee08.tar.gz pleroma-906b121a1053557016734be0bf224c5ad317ee08.zip |
Merge branch 'develop' into 'vips'
# Conflicts:
# mix.exs
Diffstat (limited to 'test')
-rw-r--r-- | test/pleroma/web/pleroma_api/controllers/instances_controller_test.exs | 2 | ||||
-rw-r--r-- | test/pleroma/web/twitter_api/util_controller_test.exs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/pleroma/web/pleroma_api/controllers/instances_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/instances_controller_test.exs index 365d26ab1..02afeda67 100644 --- a/test/pleroma/web/pleroma_api/controllers/instances_controller_test.exs +++ b/test/pleroma/web/pleroma_api/controllers/instances_controller_test.exs @@ -26,6 +26,8 @@ defmodule Pleroma.Web.PleromaApi.InstancesControllerTest do constant_unreachable: constant_unreachable, constant: constant } do + clear_config([:instance, :public], false) + constant_host = URI.parse(constant).host assert conn diff --git a/test/pleroma/web/twitter_api/util_controller_test.exs b/test/pleroma/web/twitter_api/util_controller_test.exs index a4da23635..d06ae71aa 100644 --- a/test/pleroma/web/twitter_api/util_controller_test.exs +++ b/test/pleroma/web/twitter_api/util_controller_test.exs @@ -106,7 +106,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do |> get("/api/pleroma/healthcheck") |> json_response_and_validate_schema(503) - assert response == %{} + assert response == %{"error" => "Healthcheck disabled"} end test "returns 200 when healthcheck enabled and all ok", %{conn: conn} do |