hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-03-24 20:32:49 +01:00
commit 212c31c637
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
119 changed files with 1458 additions and 485 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/web/node_info_test.exs
View file

@ -7,8 +7,8 @@ defmodule Pleroma.Web.NodeInfoTest do
import Pleroma.Factory
clear_config([:mrf_simple])
clear_config(:instance)
setup do: clear_config([:mrf_simple])
setup do: clear_config(:instance)
test "GET /.well-known/nodeinfo", %{conn: conn} do
links =
@ -105,7 +105,7 @@ defmodule Pleroma.Web.NodeInfoTest do
end
describe "`metadata/federation/enabled`" do
clear_config([:instance, :federating])
setup do: clear_config([:instance, :federating])
test "it shows if federation is enabled/disabled", %{conn: conn} do
Pleroma.Config.put([:instance, :federating], true)