projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
[akkoma]
/
test
/
web
/
twitter_api
/
util_controller_test.exs
diff --git
a/test/web/twitter_api/util_controller_test.exs
b/test/web/twitter_api/util_controller_test.exs
index 9d757b5eff4cb9b3285eead30914501577e9f3f5..30e54bebd067eca25ea56b2a1fe737ec592090fa 100644
(file)
--- a/
test/web/twitter_api/util_controller_test.exs
+++ b/
test/web/twitter_api/util_controller_test.exs
@@
-18,8
+18,8
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
:ok
end
:ok
end
- clear_config([:instance])
- clear_config([:frontend_configurations, :pleroma_fe])
+
setup do:
clear_config([:instance])
+
setup do:
clear_config([:frontend_configurations, :pleroma_fe])
describe "POST /api/pleroma/follow_import" do
setup do: oauth_access(["follow"])
describe "POST /api/pleroma/follow_import" do
setup do: oauth_access(["follow"])
@@
-318,7
+318,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
end
describe "GET /api/pleroma/healthcheck" do
end
describe "GET /api/pleroma/healthcheck" do
- clear_config([:instance, :healthcheck])
+
setup do:
clear_config([:instance, :healthcheck])
test "returns 503 when healthcheck disabled", %{conn: conn} do
Config.put([:instance, :healthcheck], false)
test "returns 503 when healthcheck disabled", %{conn: conn} do
Config.put([:instance, :healthcheck], false)
@@
-427,9
+427,7
@@
defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
end
describe "POST /main/ostatus - remote_subscribe/2" do
end
describe "POST /main/ostatus - remote_subscribe/2" do
- clear_config([:instance, :federating]) do
- Config.put([:instance, :federating], true)
- end
+ setup do: clear_config([:instance, :federating], true)
test "renders subscribe form", %{conn: conn} do
user = insert(:user)
test "renders subscribe form", %{conn: conn} do
user = insert(:user)