diff options
| author | lain <lain@soykaf.club> | 2020-01-28 14:30:34 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-28 14:30:34 +0000 |
| commit | ffa9e3a2ce7c9fee281aae429052eb6e1d736239 (patch) | |
| tree | 37c0756b161e5957bea58445d8b86cd4b7aa3bb5 | |
| parent | 6fab5fe7f892b5a9cf4d605b079e544583f0ce73 (diff) | |
| parent | 2ddd1bb0887425effd1c59f358e1dc2c5b98f65c (diff) | |
| download | pleroma-ffa9e3a2ce7c9fee281aae429052eb6e1d736239.tar.gz pleroma-ffa9e3a2ce7c9fee281aae429052eb6e1d736239.zip | |
Merge branch 'fix-elixir-v1.10' into 'develop'
Fix compatibility with Elixir v1.10
See merge request pleroma/pleroma!2153
| -rw-r--r-- | test/runtime_test.exs | 2 | ||||
| -rw-r--r-- | 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 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 |