diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-04 18:41:00 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-04 18:41:00 +0000 |
| commit | 114b95cee20c9bb4922627e5397a70d60e905fa6 (patch) | |
| tree | a188264fd550f9473ee3f1faa74d56ca9fd319fc /test/web/activity_pub/activity_pub_controller_test.exs | |
| parent | 4a602230e4b95e916b3df73bd88413b245e07de0 (diff) | |
| parent | a9e3e387c9798a810f82bbf92023b4d29abffbe5 (diff) | |
| download | pleroma-114b95cee20c9bb4922627e5397a70d60e905fa6.tar.gz pleroma-114b95cee20c9bb4922627e5397a70d60e905fa6.zip | |
Merge branch 'feature/integration_tesla' into 'develop'
[#354] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
Diffstat (limited to 'test/web/activity_pub/activity_pub_controller_test.exs')
| -rw-r--r-- | test/web/activity_pub/activity_pub_controller_test.exs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index 1c24b348c..980f43553 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -5,6 +5,11 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do alias Pleroma.{Repo, User} alias Pleroma.Activity + setup_all do + Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end) + :ok + end + describe "/relay" do test "with the relay active, it returns the relay user", %{conn: conn} do res = |