projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of Pleroma.Config in favor of Application
[akkoma]
/
test
/
web
/
federator_test.exs
diff --git
a/test/web/federator_test.exs
b/test/web/federator_test.exs
index 966702935d9406f46dc2c2a41fb5517490a40d5c..88aef0d0f5f26a9a961233c76f70cf67c09d2a2b 100644
(file)
--- a/
test/web/federator_test.exs
+++ b/
test/web/federator_test.exs
@@
-1,7
+1,6
@@
defmodule Pleroma.Web.FederatorTest do
alias Pleroma.Web.Federator
alias Pleroma.Web.CommonAPI
defmodule Pleroma.Web.FederatorTest do
alias Pleroma.Web.Federator
alias Pleroma.Web.CommonAPI
- alias Pleroma.Config
use Pleroma.DataCase
import Pleroma.Factory
import Mock
use Pleroma.DataCase
import Pleroma.Factory
import Mock
@@
-40,8
+39,6
@@
defmodule Pleroma.Web.FederatorTest do
activity: activity,
relay_mock: relay_mock
} do
activity: activity,
relay_mock: relay_mock
} do
- Config.put([:instance, :allow_relay], true)
-
with_mocks([relay_mock]) do
Federator.handle(:publish, activity)
end
with_mocks([relay_mock]) do
Federator.handle(:publish, activity)
end
@@
-53,13
+50,23
@@
defmodule Pleroma.Web.FederatorTest do
activity: activity,
relay_mock: relay_mock
} do
activity: activity,
relay_mock: relay_mock
} do
- Config.put([:instance, :allow_relay], false)
+ instance =
+ Application.get_env(:pleroma, :instance)
+ |> Keyword.put(:allow_relay, false)
+
+ Application.put_env(:pleroma, :instance, instance)
with_mocks([relay_mock]) do
Federator.handle(:publish, activity)
end
refute_received :relay_publish
with_mocks([relay_mock]) do
Federator.handle(:publish, activity)
end
refute_received :relay_publish
+
+ instance =
+ Application.get_env(:pleroma, :instance)
+ |> Keyword.put(:allow_relay, true)
+
+ Application.put_env(:pleroma, :instance, instance)
end
end
end
end
end
end