Merge branch 'issue/1707' into 'develop'

[#1707] fixed `mix pleroma.instance gen`

See merge request pleroma/pleroma!2565
This commit is contained in:
lain 2020-05-21 14:32:49 +00:00
commit e0d1a942a6
2 changed files with 6 additions and 5 deletions

View file

@ -63,7 +63,7 @@ defmodule Pleroma.InstanceTest do
"--uploads-dir",
"test/uploads",
"--static-dir",
"instance/static/"
"./test/../test/instance/static/"
])
end
@ -83,6 +83,7 @@ defmodule Pleroma.InstanceTest do
assert generated_config =~ "configurable_from_database: true"
assert generated_config =~ "http: [ip: {127, 0, 0, 1}, port: 4000]"
assert File.read!(tmp_path() <> "setup.psql") == generated_setup_psql()
assert File.exists?(Path.expand("./test/instance/static/robots.txt"))
end
defp generated_setup_psql do