diff options
| author | lain <lain@soykaf.club> | 2018-12-05 21:27:56 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-12-05 21:27:56 +0100 |
| commit | 76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed (patch) | |
| tree | 5308f2d4c169085dfbe22a95a86c5271e4285ace /test/web/activity_pub/activity_pub_controller_test.exs | |
| parent | 3ea4476445a5e9b6ec1625d7caa537f79254e9d0 (diff) | |
| parent | 5f0c2372bc8be3763b649b13ee142c273583329e (diff) | |
| download | pleroma-76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed.tar.gz pleroma-76d6b1c6ab2813b1fb8f4473e4d722cc32fb2fed.zip | |
Merge remote-tracking branch 'origin' into follower-hiding
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 d8c5badb8..b4af2df5a 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 = |