pleroma

commit: ffa9e3a2ce7c9fee281aae429052eb6e1d736239
parent: 6fab5fe7f892b5a9cf4d605b079e544583f0ce73
Author: lain <lain@soykaf.club>
Date:   Tue, 28 Jan 2020 14:30:34 +0000

Merge branch 'fix-elixir-v1.10' into 'develop'

Fix compatibility with Elixir v1.10

See merge request pleroma/pleroma!2153
Diffstat:
M
test/runtime_test.exs
2
+-
M
test/support/http_request_mock.ex
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git 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
@@ -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