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 'upstream/develop' into fix-prameter-name-of-accounts...
[akkoma]
/
test
/
web
/
plugs
/
federating_plug_test.exs
diff --git
a/test/web/plugs/federating_plug_test.exs
b/test/web/plugs/federating_plug_test.exs
index 612db7e32e608cfeec6479bf04fda039e6140c11..9dcab93dab07fe736d9c1c238330a49494ae5923 100644
(file)
--- a/
test/web/plugs/federating_plug_test.exs
+++ b/
test/web/plugs/federating_plug_test.exs
@@
-1,16
+1,13
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.FederatingPlugTest do
use Pleroma.Web.ConnCase
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.FederatingPlugTest do
use Pleroma.Web.ConnCase
+ clear_config_all([:instance, :federating])
test "returns and halt the conn when federating is disabled" do
test "returns and halt the conn when federating is disabled" do
- instance =
- Application.get_env(:pleroma, :instance)
- |> Keyword.put(:federating, false)
-
- Application.put_env(:pleroma, :instance, instance)
+ Pleroma.Config.put([:instance, :federating], false)
conn =
build_conn()
conn =
build_conn()
@@
-18,15
+15,11
@@
defmodule Pleroma.Web.FederatingPlugTest do
assert conn.status == 404
assert conn.halted
assert conn.status == 404
assert conn.halted
-
- instance =
- Application.get_env(:pleroma, :instance)
- |> Keyword.put(:federating, true)
-
- Application.put_env(:pleroma, :instance, instance)
end
test "does nothing when federating is enabled" do
end
test "does nothing when federating is enabled" do
+ Pleroma.Config.put([:instance, :federating], true)
+
conn =
build_conn()
|> Pleroma.Web.FederatingPlug.call(%{})
conn =
build_conn()
|> Pleroma.Web.FederatingPlug.call(%{})