diff options
author | Alex S <alex.strizhakov@gmail.com> | 2019-06-16 18:49:24 +0800 |
---|---|---|
committer | Alex S <alex.strizhakov@gmail.com> | 2019-06-16 20:10:12 +0800 |
commit | 0f59265a50c0985d6ab0ce47b12dd135cfd1e8ac (patch) | |
tree | 02eac2a90fd1240145eadcafbc92dc65ccf64692 /test | |
parent | efa445a75b242787a30ffbc2eb16bd165260f66c (diff) | |
download | pleroma-0f59265a50c0985d6ab0ce47b12dd135cfd1e8ac.tar.gz pleroma-0f59265a50c0985d6ab0ce47b12dd135cfd1e8ac.zip |
salmon fix
removed some ownership sandbox error
Diffstat (limited to 'test')
-rw-r--r-- | test/object/containment_test.exs | 6 | ||||
-rw-r--r-- | test/support/http_request_mock.ex | 24 |
2 files changed, 29 insertions, 1 deletions
diff --git a/test/object/containment_test.exs b/test/object/containment_test.exs index a7a046203..a860355b8 100644 --- a/test/object/containment_test.exs +++ b/test/object/containment_test.exs @@ -5,6 +5,7 @@ defmodule Pleroma.Object.ContainmentTest do alias Pleroma.User import Pleroma.Factory + import ExUnit.CaptureLog setup_all do Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) @@ -57,7 +58,10 @@ defmodule Pleroma.Object.ContainmentTest do follower_address: User.ap_followers(%User{nickname: "rye@niu.moe"}) }) - {:error, _} = User.get_or_fetch_by_ap_id("https://n1u.moe/users/rye") + assert capture_log(fn -> + {:error, _} = User.get_or_fetch_by_ap_id("https://n1u.moe/users/rye") + end) =~ + "[error] Could not decode user at fetch https://n1u.moe/users/rye, {:error, :error}" end end end diff --git a/test/support/http_request_mock.ex b/test/support/http_request_mock.ex index 67ef0928a..f7f55a11a 100644 --- a/test/support/http_request_mock.ex +++ b/test/support/http_request_mock.ex @@ -802,6 +802,30 @@ defmodule HttpRequestMock do }} end + def post("http://mastodon.example.org/inbox", _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: "" + }} + end + + def post("https://hubzilla.example.org/inbox", _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: "" + }} + end + + def post("http://gs.example.org/index.php/main/salmon/user/1", _, _, _) do + {:ok, + %Tesla.Env{ + status: 200, + body: "" + }} + end + def post("http://200.site" <> _, _, _, _) do {:ok, %Tesla.Env{ |