total rebaseHEADmaster

5 files changed, 6 insertions, 7 deletions

diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index f3453dd..fca2324 100755..100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -125,13 +125,12 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
         media_removal: ["some.removal", {"some.other.instance", "Some reason"}]
       )
 
-      expected_config = [
+      expected_config =
         {:media_removal, [{"some.removal", ""}, {"some.other.instance", "Some reason"}]}
-      ]
 
       capture_log(fn -> DeprecationWarnings.warn() end)
 
-      assert Config.get([:mrf_simple]) == expected_config
+      assert expected_config in Config.get([:mrf_simple])
     end
 
     test "doesn't give a warning with correct config" do
@@ -215,7 +214,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
 
                ```
                config :pleroma, :mrf,
-                 transparency_exclusions: [{"instance.tld", "Reason to exlude transparency"}]
+                 transparency_exclusions: [{"instance.tld", "Reason to exclude transparency"}]
                ```
                """
     end
@@ -327,11 +326,11 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
            end) =~ "Your config is using old namespace for activity expiration configuration."
   end
 
-  test "check_uploders_s3_public_endpoint/0" do
+  test "check_uploaders_s3_public_endpoint/0" do
     clear_config([Pleroma.Uploaders.S3], public_endpoint: "https://fake.amazonaws.com/bucket/")
 
     assert capture_log(fn ->
-             DeprecationWarnings.check_uploders_s3_public_endpoint()
+             DeprecationWarnings.check_uploaders_s3_public_endpoint()
            end) =~
              "Your config is using the old setting for controlling the URL of media uploaded to your S3 bucket."
   end
diff --git a/test/pleroma/config/holder_test.exs b/test/pleroma/config/holder_test.exs
index e801da5..e801da5 100755..100644
--- a/test/pleroma/config/holder_test.exs
+++ b/test/pleroma/config/holder_test.exs
diff --git a/test/pleroma/config/loader_test.exs b/test/pleroma/config/loader_test.exs
index 784817d..784817d 100755..100644
--- a/test/pleroma/config/loader_test.exs
+++ b/test/pleroma/config/loader_test.exs
diff --git a/test/pleroma/config/release_runtime_provider_test.exs b/test/pleroma/config/release_runtime_provider_test.exs
index 8ff578e..8d2a93d 100755..100644
--- a/test/pleroma/config/release_runtime_provider_test.exs
+++ b/test/pleroma/config/release_runtime_provider_test.exs
@@ -10,7 +10,7 @@ defmodule Pleroma.Config.ReleaseRuntimeProviderTest do
   describe "load/2" do
     test "loads release defaults config and warns about non-existent runtime config" do
       ExUnit.CaptureIO.capture_io(fn ->
-        merged = ReleaseRuntimeProvider.load([], [])
+        merged = ReleaseRuntimeProvider.load([], config_path: "/var/empty/config.exs")
         assert merged == Pleroma.Config.Holder.release_defaults()
       end) =~
         "!!! Config path is not declared! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file"
diff --git a/test/pleroma/config/transfer_task_test.exs b/test/pleroma/config/transfer_task_test.exs
index 6295fa8..6295fa8 100755..100644
--- a/test/pleroma/config/transfer_task_test.exs
+++ b/test/pleroma/config/transfer_task_test.exs