Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
[akkoma] / test / tasks / instance_test.exs
index a3b0dcb50a15b724d420c1d64005509c265ba0dd..d69275726e280c11e19c8296b3c90c7a741a07d7 100644 (file)
@@ -10,7 +10,7 @@ defmodule Pleroma.InstanceTest do
 
     on_exit(fn ->
       File.rm_rf(tmp_path())
-      static_dir = Pleroma.Config.get([:instance, :static_dir], "instance/static/")
+      static_dir = Pleroma.Config.get([:instance, :static_dir], "test/instance_static/")
 
       if File.exists?(static_dir) do
         File.rm_rf(Path.join(static_dir, "robots.txt"))
@@ -78,7 +78,7 @@ defmodule Pleroma.InstanceTest do
     assert generated_config =~ "database: \"dbname\""
     assert generated_config =~ "username: \"dbuser\""
     assert generated_config =~ "password: \"dbpass\""
-    assert generated_config =~ "dynamic_configuration: true"
+    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()
   end