projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/remove-others-follower-collections' into 'develop'
[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..530562325f7a99664c48d6d2cfc9879448505987 100644
(file)
--- a/
test/web/plugs/federating_plug_test.exs
+++ b/
test/web/plugs/federating_plug_test.exs
@@
-1,12
+1,12
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.FederatingPlugTest do
use Pleroma.Web.ConnCase
test "returns and halt the conn when federating is disabled" do
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)
-
- Application.put_env(:pleroma, :instance, instance)
+ Pleroma.Config.put([:instance, :federating], false)
conn =
build_conn()
conn =
build_conn()
@@
-15,11
+15,7
@@
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)
+ Pleroma.Config.put([:instance, :federating], true)
end
test "does nothing when federating is enabled" do
end
test "does nothing when federating is enabled" do