changes after rebase

2020-10-13 17:10:34 +03:00 · 2020-10-13 17:10:34 +03:00 · 4c4ea9a348
commit 4c4ea9a348
parent 3cb9c88837
12 changed files with 5 additions and 12 deletions
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@ -87,7 +87,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
  end

  test "check_activity_expiration_config/0" do
-    clear_config([Pleroma.ActivityExpiration, :enabled], true)
+    clear_config(Pleroma.ActivityExpiration, enabled: true)

    assert capture_log(fn ->
             DeprecationWarnings.check_activity_expiration_config()
--- a/test/pleroma/emoji/pack_test.exs
+++ b/test/pleroma/emoji/pack_test.exs
--- a/test/pleroma/user/import_test.exs
+++ b/test/pleroma/user/import_test.exs
--- a/test/pleroma/user/query_test.exs
+++ b/test/pleroma/user/query_test.exs
--- a/test/pleroma/utils_test.exs
+++ b/test/pleroma/utils_test.exs
--- a/test/pleroma/web/pleroma_api/controllers/emoji_file_controller_test.exs
+++ b/test/pleroma/web/pleroma_api/controllers/emoji_file_controller_test.exs
--- a/test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs
+++ b/test/pleroma/web/pleroma_api/controllers/user_import_controller_test.exs
--- a/test/pleroma/web/rich_media/helpers_test.exs
+++ b/test/pleroma/web/rich_media/helpers_test.exs
@ -6,7 +6,6 @@ defmodule Pleroma.Web.RichMedia.HelpersTest do
  use Pleroma.DataCase

  alias Pleroma.Config
-  alias Pleroma.Object
  alias Pleroma.Web.CommonAPI
  alias Pleroma.Web.RichMedia.Helpers