summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-01-28 18:23:59 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-01-28 18:23:59 +0400
commit2ddd1bb0887425effd1c59f358e1dc2c5b98f65c (patch)
tree5c49d3714f4e3e611aa13a4e80765bb0c6f8b1c6
parentb12f3064730648de992f934cf5a23cadb5206b9d (diff)
Fix compatibility with Elixir v1.10
-rw-r--r--test/runtime_test.exs2
-rw-r--r--test/support/http_request_mock.ex2
-rw-r--r--test/web/mastodon_api/controllers/suggestion_controller_test.exs1
3 files changed, 2 insertions, 3 deletions
diff --git a/test/runtime_test.exs b/test/runtime_test.exs
index f7b6f23d4..6bde608ae 100644
--- a/test/runtime_test.exs
+++ b/test/runtime_test.exs
@@ -6,6 +6,6 @@ defmodule Pleroma.RuntimeTest do
use ExUnit.Case, async: true
test "it loads custom runtime modules" do
- assert Code.ensure_compiled?(RuntimeModule)
+ assert {:module, RuntimeModule} == Code.ensure_compiled(RuntimeModule)
end
end
diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex
index f43de700d..ba3341327 100644
--- a/test/support/http_request_mock.ex
+++ b/test/support/http_request_mock.ex
@@ -19,7 +19,7 @@ defmodule HttpRequestMock do
else
error ->
with {:error, message} <- error do
- Logger.warn(message)
+ Logger.warn(to_string(message))
end
{_, _r} = error
diff --git a/test/web/mastodon_api/controllers/suggestion_controller_test.exs b/test/web/mastodon_api/controllers/suggestion_controller_test.exs
index c288c2fff..0319d3475 100644
--- a/test/web/mastodon_api/controllers/suggestion_controller_test.exs
+++ b/test/web/mastodon_api/controllers/suggestion_controller_test.exs
@@ -7,7 +7,6 @@ defmodule Pleroma.Web.MastodonAPI.SuggestionControllerTest do
alias Pleroma.Config
- import ExUnit.CaptureLog
import Pleroma.Factory
import Tesla.Mock