diff options
author | kaniini <ariadne@dereferenced.org> | 2019-07-15 19:47:23 +0000 |
---|---|---|
committer | kaniini <ariadne@dereferenced.org> | 2019-07-15 19:47:23 +0000 |
commit | d80bcd270d6c915c91b212d5549fc866e5d5e4e9 (patch) | |
tree | cc1af678f1fe1bbbd7feaf5aad592cb96a28286b /test/reverse_proxy_test.exs | |
parent | 30d7e22784eaeb36099bd9e7a197b8a9676b6123 (diff) | |
parent | b74300bc7a02912489033ea23ccaf876881ef650 (diff) | |
download | pleroma-d80bcd270d6c915c91b212d5549fc866e5d5e4e9.tar.gz pleroma-d80bcd270d6c915c91b212d5549fc866e5d5e4e9.zip |
Merge branch 'tests/mastodon-common-api' into 'develop'
Add more tests for MastodonAPIController and CommonAPI
See merge request pleroma/pleroma!1425
Diffstat (limited to 'test/reverse_proxy_test.exs')
-rw-r--r-- | test/reverse_proxy_test.exs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/reverse_proxy_test.exs b/test/reverse_proxy_test.exs index f542de97c..f4b7d6add 100644 --- a/test/reverse_proxy_test.exs +++ b/test/reverse_proxy_test.exs @@ -5,7 +5,6 @@ defmodule Pleroma.ReverseProxyTest do use Pleroma.Web.ConnCase, async: true import ExUnit.CaptureLog - import ExUnit.CaptureLog import Mox alias Pleroma.ReverseProxy alias Pleroma.ReverseProxy.ClientMock |