Merge branch 'improve/instance-gen' into 'develop'

#2159 Support enabling upload filters during instance gen

See merge request pleroma/pleroma!3070
This commit is contained in:
feld 2020-10-12 17:24:24 +00:00
commit 03855f9789
4 changed files with 77 additions and 3 deletions

View file

@ -63,7 +63,13 @@ defmodule Pleroma.InstanceTest do
"--uploads-dir",
"test/uploads",
"--static-dir",
"./test/../test/instance/static/"
"./test/../test/instance/static/",
"--strip-uploads",
"y",
"--dedupe-uploads",
"n",
"--anonymize-uploads",
"n"
])
end
@ -82,6 +88,7 @@ defmodule Pleroma.InstanceTest do
assert generated_config =~ "password: \"dbpass\""
assert generated_config =~ "configurable_from_database: true"
assert generated_config =~ "http: [ip: {127, 0, 0, 1}, port: 4000]"
assert generated_config =~ "filters: [Pleroma.Upload.Filter.ExifTool]"
assert File.read!(tmp_path() <> "setup.psql") == generated_setup_psql()
assert File.exists?(Path.expand("./test/instance/static/robots.txt"))
end