projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.0.0' into 'stable'
[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 1455a1c467ddce6ecd832a71b5b9367126ef83de..13edc435960e2a53c632e9343514b08774160a0c 100644
(file)
--- a/
test/web/plugs/federating_plug_test.exs
+++ b/
test/web/plugs/federating_plug_test.exs
@@
-1,12
+1,14
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.FederatingPlugTest do
use Pleroma.Web.ConnCase
defmodule Pleroma.Web.FederatingPlugTest do
use Pleroma.Web.ConnCase
- test "returns and halt the conn when federating is disabled" do
- instance =
- Application.get_env(:pleroma, :instance)
- |> Keyword.put(:federating, false)
+ clear_config([:instance, :federating])
- Application.put_env(:pleroma, :instance, instance)
+ test "returns and halt the conn when federating is disabled" do
+ Pleroma.Config.put([:instance, :federating], false)
conn =
build_conn()
conn =
build_conn()
@@
-14,15
+16,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(%{})